From d7d458d45cbe44456afd735164a0ba921497c162 Mon Sep 17 00:00:00 2001 From: Andrey Date: Sun, 7 Jun 2015 10:45:37 +0200 Subject: [PATCH] Added RACAFNConstants file. Changed the visibility of rac_requestPath method to public. --- RACAFNetworking.xcodeproj/project.pbxproj | 12 ++++++++++++ .../AFHTTPRequestOperationManager+RACSupport.h | 4 ++++ .../AFHTTPRequestOperationManager+RACSupport.m | 10 +++++----- .../AFHTTPSessionManager+RACSupport.h | 4 ++++ .../AFHTTPSessionManager+RACSupport.m | 14 +++++++------- RACAFNetworking/RACAFNConstants.h | 16 ++++++++++++++++ RACAFNetworking/RACAFNConstants.m | 16 ++++++++++++++++ 7 files changed, 64 insertions(+), 12 deletions(-) create mode 100644 RACAFNetworking/RACAFNConstants.h create mode 100644 RACAFNetworking/RACAFNConstants.m diff --git a/RACAFNetworking.xcodeproj/project.pbxproj b/RACAFNetworking.xcodeproj/project.pbxproj index ac80b46..10faba3 100644 --- a/RACAFNetworking.xcodeproj/project.pbxproj +++ b/RACAFNetworking.xcodeproj/project.pbxproj @@ -7,6 +7,10 @@ objects = { /* Begin PBXBuildFile section */ + 550D0EBF1B243AB200FEB6EF /* RACAFNConstants.h in Headers */ = {isa = PBXBuildFile; fileRef = 550D0EBD1B243AB200FEB6EF /* RACAFNConstants.h */; }; + 550D0EC01B243AB200FEB6EF /* RACAFNConstants.h in Headers */ = {isa = PBXBuildFile; fileRef = 550D0EBD1B243AB200FEB6EF /* RACAFNConstants.h */; }; + 550D0EC11B243AB200FEB6EF /* RACAFNConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = 550D0EBE1B243AB200FEB6EF /* RACAFNConstants.m */; }; + 550D0EC21B243AB200FEB6EF /* RACAFNConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = 550D0EBE1B243AB200FEB6EF /* RACAFNConstants.m */; }; 84DA97D7196C9FEA0064A552 /* RACAFNetworking.h in Headers */ = {isa = PBXBuildFile; fileRef = 84DA97D6196C9FEA0064A552 /* RACAFNetworking.h */; settings = {ATTRIBUTES = (Public, ); }; }; 84DA97DD196C9FEA0064A552 /* RACAFNetworking.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84DA97D1196C9FEA0064A552 /* RACAFNetworking.framework */; }; 84DA97F5196CA0430064A552 /* AFHTTPRequestOperationManager+RACSupport.h in Headers */ = {isa = PBXBuildFile; fileRef = 84DA97ED196CA0430064A552 /* AFHTTPRequestOperationManager+RACSupport.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -274,6 +278,8 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 550D0EBD1B243AB200FEB6EF /* RACAFNConstants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RACAFNConstants.h; sourceTree = ""; }; + 550D0EBE1B243AB200FEB6EF /* RACAFNConstants.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RACAFNConstants.m; sourceTree = ""; }; 84DA97D1196C9FEA0064A552 /* RACAFNetworking.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = RACAFNetworking.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 84DA97D5196C9FEA0064A552 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 84DA97D6196C9FEA0064A552 /* RACAFNetworking.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RACAFNetworking.h; sourceTree = ""; }; @@ -460,6 +466,8 @@ 84DA97F2196CA0430064A552 /* AFURLConnectionOperation+RACSupport.m */, 84DA97F3196CA0430064A552 /* RACSubscriber+AFProgressCallbacks.h */, 84DA97F4196CA0430064A552 /* RACSubscriber+AFProgressCallbacks.m */, + 550D0EBD1B243AB200FEB6EF /* RACAFNConstants.h */, + 550D0EBE1B243AB200FEB6EF /* RACAFNConstants.m */, ); name = Classes; sourceTree = ""; @@ -664,6 +672,7 @@ 84DA9816196CA05D0064A552 /* AFHTTPSessionManager.h in Headers */, 84DA97F7196CA0430064A552 /* AFHTTPSessionManager+RACSupport.h in Headers */, 84DA9814196CA05D0064A552 /* AFHTTPRequestOperationManager.h in Headers */, + 550D0EBF1B243AB200FEB6EF /* RACAFNConstants.h in Headers */, 84DA97F5196CA0430064A552 /* AFHTTPRequestOperationManager+RACSupport.h in Headers */, 84DA9819196CA05D0064A552 /* AFNetworkReachabilityManager.h in Headers */, 84DA9821196CA05D0064A552 /* AFURLResponseSerialization.h in Headers */, @@ -681,6 +690,7 @@ 84DA994C196CAD4C0064A552 /* RACAFNetworking.h in Headers */, 84DA994D196CAD4C0064A552 /* AFHTTPRequestOperationManager+RACSupport.h in Headers */, 84DA994E196CAD4C0064A552 /* AFHTTPSessionManager+RACSupport.h in Headers */, + 550D0EC01B243AB200FEB6EF /* RACAFNConstants.h in Headers */, 84DA994F196CAD4C0064A552 /* AFURLConnectionOperation+RACSupport.h in Headers */, 84DA9951196CAD4C0064A552 /* AFHTTPRequestOperation.h in Headers */, 84DA9952196CAD4C0064A552 /* AFHTTPRequestOperationManager.h in Headers */, @@ -1006,6 +1016,7 @@ 84DA9817196CA05D0064A552 /* AFHTTPSessionManager.m in Sources */, 84DA981A196CA05D0064A552 /* AFNetworkReachabilityManager.m in Sources */, 84DA9822196CA05D0064A552 /* AFURLResponseSerialization.m in Sources */, + 550D0EC11B243AB200FEB6EF /* RACAFNConstants.m in Sources */, 84DA9824196CA05D0064A552 /* AFURLSessionManager.m in Sources */, 84DA97FC196CA0430064A552 /* RACSubscriber+AFProgressCallbacks.m in Sources */, ); @@ -1035,6 +1046,7 @@ 84DA98AB196CA2070064A552 /* AFSecurityPolicy.m in Sources */, 84DA98AC196CA2070064A552 /* AFURLConnectionOperation.m in Sources */, 84DA98AD196CA2070064A552 /* AFURLRequestSerialization.m in Sources */, + 550D0EC21B243AB200FEB6EF /* RACAFNConstants.m in Sources */, 84DA98AE196CA2070064A552 /* AFURLResponseSerialization.m in Sources */, 84DA98AF196CA2070064A552 /* AFURLSessionManager.m in Sources */, ); diff --git a/RACAFNetworking/AFHTTPRequestOperationManager+RACSupport.h b/RACAFNetworking/AFHTTPRequestOperationManager+RACSupport.h index ce15d15..5f51c73 100644 --- a/RACAFNetworking/AFHTTPRequestOperationManager+RACSupport.h +++ b/RACAFNetworking/AFHTTPRequestOperationManager+RACSupport.h @@ -8,6 +8,7 @@ #import "AFHTTPRequestOperationManager.h" #import +#import "RACAFNConstants.h" /// User info key for accessing the AFHTTPRequestOperation on which the error occured. extern NSString *const RAFNetworkingOperationErrorKey; @@ -69,6 +70,9 @@ extern NSString *const RAFNetworkingOperationErrorKey; /// resulting JSON object and response headers or error. - (RACSignal *)rac_PATCH:(NSString *)path parameters:(id)parameters; +/// A basic method that returns a cold signal of the resulting JSON object and response headers or error. +- (RACSignal *)rac_requestPath:(NSString *)path parameters:(id)parameters method:(NSString *)method; + @end @interface AFHTTPRequestOperationManager (RACSupportDeprecated) diff --git a/RACAFNetworking/AFHTTPRequestOperationManager+RACSupport.m b/RACAFNetworking/AFHTTPRequestOperationManager+RACSupport.m index 88b0311..b0ccaa2 100644 --- a/RACAFNetworking/AFHTTPRequestOperationManager+RACSupport.m +++ b/RACAFNetworking/AFHTTPRequestOperationManager+RACSupport.m @@ -23,27 +23,27 @@ - (RACSignal *)rac_enqueueBatchOfHTTPRequestOperations:(NSArray *)requestOperati } - (RACSignal *)rac_GET:(NSString *)path parameters:(id)parameters { - return [[self rac_requestPath:path parameters:parameters method:@"GET"] + return [[self rac_requestPath:path parameters:parameters method:RACAFNHttpMethodGet] setNameWithFormat:@"%@ -rac_GET: %@, parameters: %@", self.class, path, parameters]; } - (RACSignal *)rac_POST:(NSString *)path parameters:(id)parameters { - return [[self rac_requestPath:path parameters:parameters method:@"POST"] + return [[self rac_requestPath:path parameters:parameters method:RACAFNHttpMethodPost] setNameWithFormat:@"%@ -rac_POST: %@, parameters: %@", self.class, path, parameters]; } - (RACSignal *)rac_PUT:(NSString *)path parameters:(id)parameters { - return [[self rac_requestPath:path parameters:parameters method:@"PUT"] + return [[self rac_requestPath:path parameters:parameters method:RACAFNHttpMethodPut] setNameWithFormat:@"%@ -rac_PUT: %@, parameters: %@", self.class, path, parameters]; } - (RACSignal *)rac_DELETE:(NSString *)path parameters:(id)parameters { - return [[self rac_requestPath:path parameters:parameters method:@"DELETE"] + return [[self rac_requestPath:path parameters:parameters method:RACAFNHttpMethodDelete] setNameWithFormat:@"%@ -rac_DELETE: %@, parameters: %@", self.class, path, parameters]; } - (RACSignal *)rac_PATCH:(NSString *)path parameters:(id)parameters { - return [[self rac_requestPath:path parameters:parameters method:@"PATCH"] + return [[self rac_requestPath:path parameters:parameters method:RACAFNHttpMethodPatch] setNameWithFormat:@"%@ -rac_PATCH: %@, parameters: %@", self.class, path, parameters]; } diff --git a/RACAFNetworking/AFHTTPSessionManager+RACSupport.h b/RACAFNetworking/AFHTTPSessionManager+RACSupport.h index afbe620..f4a3ef4 100644 --- a/RACAFNetworking/AFHTTPSessionManager+RACSupport.h +++ b/RACAFNetworking/AFHTTPSessionManager+RACSupport.h @@ -8,6 +8,7 @@ #import "AFHTTPSessionManager.h" #import +#import "RACAFNConstants.h" #if (defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 70000) || (defined(__MAC_OS_X_VERSION_MAX_ALLOWED) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 1090) @@ -43,6 +44,9 @@ extern NSString *const RACAFNResponseObjectErrorKey; /// resulting JSON object and response headers or error. - (RACSignal *)rac_DELETE:(NSString *)path parameters:(id)parameters; +/// A basic method that returns a cold signal of the resulting JSON object and response headers or error. +- (RACSignal *)rac_requestPath:(NSString *)path parameters:(id)parameters method:(NSString *)method; + @end #endif diff --git a/RACAFNetworking/AFHTTPSessionManager+RACSupport.m b/RACAFNetworking/AFHTTPSessionManager+RACSupport.m index e50d8d3..befb2da 100644 --- a/RACAFNetworking/AFHTTPSessionManager+RACSupport.m +++ b/RACAFNetworking/AFHTTPSessionManager+RACSupport.m @@ -15,23 +15,23 @@ @implementation AFHTTPSessionManager (RACSupport) - (RACSignal *)rac_GET:(NSString *)path parameters:(id)parameters { - return [[self rac_requestPath:path parameters:parameters method:@"GET"] + return [[self rac_requestPath:path parameters:parameters method:RACAFNHttpMethodGet] setNameWithFormat:@"%@ -rac_GET: %@, parameters: %@", self.class, path, parameters]; } - (RACSignal *)rac_HEAD:(NSString *)path parameters:(id)parameters { - return [[self rac_requestPath:path parameters:parameters method:@"HEAD"] + return [[self rac_requestPath:path parameters:parameters method:RACAFNHttpMethodHead] setNameWithFormat:@"%@ -rac_HEAD: %@, parameters: %@", self.class, path, parameters]; } - (RACSignal *)rac_POST:(NSString *)path parameters:(id)parameters { - return [[self rac_requestPath:path parameters:parameters method:@"POST"] + return [[self rac_requestPath:path parameters:parameters method:RACAFNHttpMethodPost] setNameWithFormat:@"%@ -rac_POST: %@, parameters: %@", self.class, path, parameters]; } - (RACSignal *)rac_POST:(NSString *)path parameters:(id)parameters constructingBodyWithBlock:(void (^)(id formData))block { return [[RACSignal createSignal:^(id subscriber) { - NSMutableURLRequest *request = [self.requestSerializer multipartFormRequestWithMethod:@"POST" URLString:[[NSURL URLWithString:path relativeToURL:self.baseURL] absoluteString] parameters:parameters constructingBodyWithBlock:block error:nil]; + NSMutableURLRequest *request = [self.requestSerializer multipartFormRequestWithMethod:RACAFNHttpMethodPost URLString:[[NSURL URLWithString:path relativeToURL:self.baseURL] absoluteString] parameters:parameters constructingBodyWithBlock:block error:nil]; NSURLSessionDataTask *task = [self dataTaskWithRequest:request completionHandler:^(NSURLResponse *response, id responseObject, NSError *error) { if (error) { @@ -56,17 +56,17 @@ - (RACSignal *)rac_POST:(NSString *)path parameters:(id)parameters constructingB } - (RACSignal *)rac_PUT:(NSString *)path parameters:(id)parameters { - return [[self rac_requestPath:path parameters:parameters method:@"PUT"] + return [[self rac_requestPath:path parameters:parameters method:RACAFNHttpMethodPut] setNameWithFormat:@"%@ -rac_PUT: %@, parameters: %@", self.class, path, parameters]; } - (RACSignal *)rac_PATCH:(NSString *)path parameters:(id)parameters { - return [[self rac_requestPath:path parameters:parameters method:@"PATCH"] + return [[self rac_requestPath:path parameters:parameters method:RACAFNHttpMethodPatch] setNameWithFormat:@"%@ -rac_PATCH: %@, parameters: %@", self.class, path, parameters]; } - (RACSignal *)rac_DELETE:(NSString *)path parameters:(id)parameters { - return [[self rac_requestPath:path parameters:parameters method:@"DELETE"] + return [[self rac_requestPath:path parameters:parameters method:RACAFNHttpMethodDelete] setNameWithFormat:@"%@ -rac_DELETE: %@, parameters: %@", self.class, path, parameters]; } diff --git a/RACAFNetworking/RACAFNConstants.h b/RACAFNetworking/RACAFNConstants.h new file mode 100644 index 0000000..664608c --- /dev/null +++ b/RACAFNetworking/RACAFNConstants.h @@ -0,0 +1,16 @@ +// +// RACAFNConstants.h +// RACAFNetworking +// +// Created by Andrey on 07.06.15. +// Copyright (c) 2015 Robert Widmann. All rights reserved. +// + +#import + +extern NSString *const RACAFNHttpMethodHead; +extern NSString *const RACAFNHttpMethodPost; +extern NSString *const RACAFNHttpMethodPut; +extern NSString *const RACAFNHttpMethodGet; +extern NSString *const RACAFNHttpMethodDelete; +extern NSString *const RACAFNHttpMethodPatch; \ No newline at end of file diff --git a/RACAFNetworking/RACAFNConstants.m b/RACAFNetworking/RACAFNConstants.m new file mode 100644 index 0000000..40baec5 --- /dev/null +++ b/RACAFNetworking/RACAFNConstants.m @@ -0,0 +1,16 @@ +// +// RACAFNConstants.m +// RACAFNetworking +// +// Created by Andrey on 07.06.15. +// Copyright (c) 2015 Robert Widmann. All rights reserved. +// + +#import "RACAFNConstants.h" + +NSString *const RACAFNHttpMethodHead = @"HEAD"; +NSString *const RACAFNHttpMethodPost = @"POST"; +NSString *const RACAFNHttpMethodPut = @"PUT"; +NSString *const RACAFNHttpMethodGet = @"GET"; +NSString *const RACAFNHttpMethodDelete = @"DELETE"; +NSString *const RACAFNHttpMethodPatch = @"PATCH"; \ No newline at end of file