Skip to content

Cache policy support #55

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.

Sign up for GitHub

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

Open
wants to merge 20 commits into
base: master
Choose a base branch
from
+132 −126
Open

Cache policy support #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
75c7a69
Added cache policy support
bddq Sep 11, 2015
604fcc0
Merge branch 'release/cachePolicy'
bddq Sep 11, 2015
b047eb8
Transition from NSURLConnection to NSURLSession
bddq Dec 23, 2015
1128c3b
Merge branch 'release/nsurlsession'
bddq Dec 23, 2015
c27080c
Removed dispatch group and queue + cleaning code
bddq Jan 9, 2016
36e1031
Changed progress block to pass totalBytes and expectedBytes
bddq Jan 24, 2016
e43234f
Merge branch 'release/progrees-block'
bddq Jan 24, 2016
e6e9cad
Added missing UIKit framework import for use with Swift
bddq Jan 27, 2016
c17ade8
Merge branch 'hotfix/uikit' into develop
bddq Jan 27, 2016
1605718
Merge branch 'hotfix/uikit'
bddq Jan 27, 2016
2e20ce4
Added a definition for the progress handler block
bddq Jan 28, 2016
2d51958
Removed deprecated method since iOS 9
bddq Jan 28, 2016
36b27cc
Added PUT HTTP method with progress block
bddq Jan 28, 2016
80d6c9d
Merge branch 'develop'
bddq Jan 28, 2016
3276314
Added Accept-Language header
bddq Jun 19, 2016
cfaf9a5
Added application/javascript as a valid MIME type for json contents
bddq Jun 14, 2017
b89617c
Changed preprocessor macro because __has_feature(attribute_availabili…
bddq Jun 17, 2017
6c60120
Added SV_APP_EXTENSION test
bddq Jun 26, 2017
512aaa4
Added missing test for app extension
bddq Jun 26, 2017
f9d1a31
Fixed Xcode warning
bddq Feb 16, 2018
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
6 changes: 4 additions & 2 deletions SVHTTPRequest/SVHTTPClient.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#import <Foundation/Foundation.h>

typedef void (^SVHTTPRequestCompletionHandler)(id response, NSHTTPURLResponse *urlResponse, NSError *error);
typedef void (^SVHTTPRequestProgressHandler)(int64_t totalBytes, int64_t totalBytesExpected);

@class SVHTTPRequest;

Expand All @@ -22,11 +23,12 @@ typedef void (^SVHTTPRequestCompletionHandler)(id response, NSHTTPURLResponse *u
- (void)setValue:(NSString *)value forHTTPHeaderField:(NSString *)field;

- (SVHTTPRequest*)GET:(NSString*)path parameters:(NSDictionary*)parameters completion:(SVHTTPRequestCompletionHandler)completionBlock;
- (SVHTTPRequest*)GET:(NSString*)path parameters:(NSDictionary*)parameters saveToPath:(NSString*)savePath progress:(void (^)(float progress))progressBlock completion:(SVHTTPRequestCompletionHandler)completionBlock;
- (SVHTTPRequest*)GET:(NSString*)path parameters:(NSDictionary*)parameters saveToPath:(NSString*)savePath progress:(SVHTTPRequestProgressHandler)progressBlock completion:(SVHTTPRequestCompletionHandler)completionBlock;

- (SVHTTPRequest*)POST:(NSString*)path parameters:(NSObject*)parameters completion:(SVHTTPRequestCompletionHandler)completionBlock;
- (SVHTTPRequest*)POST:(NSString*)path parameters:(NSObject*)parameters progress:(void (^)(float progress))progressBlock completion:(void (^)(id response, NSHTTPURLResponse *urlResponse, NSError *error))completionBlock;
- (SVHTTPRequest*)POST:(NSString*)path parameters:(NSObject*)parameters progress:(SVHTTPRequestProgressHandler)progressBlock completion:(SVHTTPRequestCompletionHandler)completionBlock;
- (SVHTTPRequest*)PUT:(NSString*)path parameters:(NSObject*)parameters completion:(SVHTTPRequestCompletionHandler)completionBlock;
- (SVHTTPRequest*)PUT:(NSString*)path parameters:(NSObject*)parameters progress:(SVHTTPRequestProgressHandler)progressBlock completion:(SVHTTPRequestCompletionHandler)completionBlock;

- (SVHTTPRequest*)DELETE:(NSString*)path parameters:(NSDictionary*)parameters completion:(SVHTTPRequestCompletionHandler)completionBlock;
- (SVHTTPRequest*)HEAD:(NSString*)path parameters:(NSDictionary*)parameters completion:(SVHTTPRequestCompletionHandler)completionBlock;
Expand Down
12 changes: 8 additions & 4 deletions SVHTTPRequest/SVHTTPClient.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ - (SVHTTPRequest*)queueRequest:(NSString*)path
method:(SVHTTPRequestMethod)method
parameters:(NSDictionary*)parameters
saveToPath:(NSString*)savePath
progress:(void (^)(float))progressBlock
progress:(SVHTTPRequestProgressHandler)progressBlock
completion:(SVHTTPRequestCompletionHandler)completionBlock;

@property (nonatomic, strong) NSMutableDictionary *HTTPHeaderFields;
Expand Down Expand Up @@ -74,22 +74,26 @@ - (SVHTTPRequest*)GET:(NSString *)path parameters:(NSDictionary *)parameters com
return [self queueRequest:path method:SVHTTPRequestMethodGET parameters:parameters saveToPath:nil progress:nil completion:completionBlock];
}

- (SVHTTPRequest*)GET:(NSString *)path parameters:(NSDictionary *)parameters saveToPath:(NSString *)savePath progress:(void (^)(float))progressBlock completion:(SVHTTPRequestCompletionHandler)completionBlock {
- (SVHTTPRequest*)GET:(NSString *)path parameters:(NSDictionary *)parameters saveToPath:(NSString *)savePath progress:(SVHTTPRequestProgressHandler)progressBlock completion:(SVHTTPRequestCompletionHandler)completionBlock {
return [self queueRequest:path method:SVHTTPRequestMethodGET parameters:parameters saveToPath:savePath progress:progressBlock completion:completionBlock];
}

- (SVHTTPRequest*)POST:(NSString *)path parameters:(NSDictionary *)parameters completion:(SVHTTPRequestCompletionHandler)completionBlock {
return [self queueRequest:path method:SVHTTPRequestMethodPOST parameters:parameters saveToPath:nil progress:nil completion:completionBlock];
}

- (SVHTTPRequest*)POST:(NSString *)path parameters:(NSDictionary *)parameters progress:(void (^)(float))progressBlock completion:(void (^)(id, NSHTTPURLResponse*, NSError *))completionBlock {
- (SVHTTPRequest*)POST:(NSString *)path parameters:(NSDictionary *)parameters progress:(SVHTTPRequestProgressHandler)progressBlock completion:(SVHTTPRequestCompletionHandler)completionBlock {
return [self queueRequest:path method:SVHTTPRequestMethodPOST parameters:parameters saveToPath:nil progress:progressBlock completion:completionBlock];
}

- (SVHTTPRequest*)PUT:(NSString *)path parameters:(NSDictionary *)parameters completion:(SVHTTPRequestCompletionHandler)completionBlock {
return [self queueRequest:path method:SVHTTPRequestMethodPUT parameters:parameters saveToPath:nil progress:nil completion:completionBlock];
}

- (SVHTTPRequest*)PUT:(NSString *)path parameters:(NSDictionary *)parameters progress:(SVHTTPRequestProgressHandler)progressBlock completion:(SVHTTPRequestCompletionHandler)completionBlock {
return [self queueRequest:path method:SVHTTPRequestMethodPUT parameters:parameters saveToPath:nil progress:progressBlock completion:completionBlock];
}

- (SVHTTPRequest*)DELETE:(NSString *)path parameters:(NSDictionary *)parameters completion:(SVHTTPRequestCompletionHandler)completionBlock {
return [self queueRequest:path method:SVHTTPRequestMethodDELETE parameters:parameters saveToPath:nil progress:nil completion:completionBlock];
}
Expand Down Expand Up @@ -129,7 +133,7 @@ - (SVHTTPRequest*)queueRequest:(NSString*)path
method:(SVHTTPRequestMethod)method
parameters:(NSDictionary*)parameters
saveToPath:(NSString*)savePath
progress:(void (^)(float))progressBlock
progress:(SVHTTPRequestProgressHandler)progressBlock
completion:(SVHTTPRequestCompletionHandler)completionBlock {

NSString *completeURLString = [NSString stringWithFormat:@"%@%@", self.basePath, path];
Expand Down
10 changes: 6 additions & 4 deletions SVHTTPRequest/SVHTTPRequest.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,15 @@ enum {
};
typedef NSUInteger SVHTTPRequestMethod;

@interface SVHTTPRequest : NSOperation
@interface SVHTTPRequest : NSOperation <NSURLSessionDelegate, NSURLSessionTaskDelegate, NSURLSessionDataDelegate, NSURLSessionDownloadDelegate>

+ (SVHTTPRequest*)GET:(NSString*)address parameters:(NSDictionary*)parameters completion:(SVHTTPRequestCompletionHandler)block;
+ (SVHTTPRequest*)GET:(NSString*)address parameters:(NSDictionary*)parameters saveToPath:(NSString*)savePath progress:(void (^)(float progress))progressBlock completion:(SVHTTPRequestCompletionHandler)completionBlock;
+ (SVHTTPRequest*)GET:(NSString*)address parameters:(NSDictionary*)parameters saveToPath:(NSString*)savePath progress:(void (^)(int64_t totalBytes, int64_t totalBytesExpected))progressBlock completion:(SVHTTPRequestCompletionHandler)completionBlock;

+ (SVHTTPRequest*)POST:(NSString*)address parameters:(NSObject*)parameters completion:(SVHTTPRequestCompletionHandler)block;
+ (SVHTTPRequest*)POST:(NSString *)address parameters:(NSObject *)parameters progress:(void (^)(float))progressBlock completion:(SVHTTPRequestCompletionHandler)completionBlock;
+ (SVHTTPRequest*)POST:(NSString *)address parameters:(NSObject *)parameters progress:(SVHTTPRequestProgressHandler)progressBlock completion:(SVHTTPRequestCompletionHandler)completionBlock;
+ (SVHTTPRequest*)PUT:(NSString*)address parameters:(NSObject*)parameters completion:(SVHTTPRequestCompletionHandler)block;
+ (SVHTTPRequest*)PUT:(NSString *)address parameters:(NSObject *)parameters progress:(SVHTTPRequestProgressHandler)progressBlock completion:(SVHTTPRequestCompletionHandler)completionBlock;

+ (SVHTTPRequest*)DELETE:(NSString*)address parameters:(NSDictionary*)parameters completion:(SVHTTPRequestCompletionHandler)block;
+ (SVHTTPRequest*)HEAD:(NSString*)address parameters:(NSDictionary*)parameters completion:(SVHTTPRequestCompletionHandler)block;
Expand All @@ -41,6 +42,7 @@ typedef NSUInteger SVHTTPRequestMethod;
- (void)preprocessParameters;
- (void)setValue:(NSString *)value forHTTPHeaderField:(NSString *)field;

+ (void)setDefaultCachePolicy:(NSURLRequestCachePolicy)cachePolicy;
+ (void)setDefaultTimeoutInterval:(NSTimeInterval)interval;
+ (void)setDefaultUserAgent:(NSString*)userAgent;

Expand All @@ -64,7 +66,7 @@ typedef NSUInteger SVHTTPRequestMethod;
method:(SVHTTPRequestMethod)method
parameters:(NSObject*)parameters
saveToPath:(NSString*)savePath
progress:(void (^)(float))progressBlock
progress:(SVHTTPRequestProgressHandler)progressBlock
completion:(SVHTTPRequestCompletionHandler)completionBlock;

- (void)signRequestWithUsername:(NSString*)username password:(NSString*)password;
Expand Down
Loading