-
Notifications
You must be signed in to change notification settings - Fork 601
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
Added isEnabled getters for OHHTTPStubs. #159
Changes from 2 commits
b0fac31
6b760a5
5a43e45
e3ad6db
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -44,6 +44,7 @@ @interface OHHTTPStubsProtocol : NSURLProtocol @end | |
@interface OHHTTPStubs() | ||
+ (instancetype)sharedInstance; | ||
@property(atomic, copy) NSMutableArray* stubDescriptors; | ||
@property(atomic, copy) NSNumber* enabledStateNumber; | ||
@property(atomic, copy, nullable) void (^onStubActivationBlock)(NSURLRequest*, id<OHHTTPStubsDescriptor>); | ||
@end | ||
|
||
|
@@ -105,7 +106,7 @@ + (void)initialize | |
{ | ||
if (self == [OHHTTPStubs class]) | ||
{ | ||
[self setEnabled:YES]; | ||
[self _setEnable:YES]; | ||
} | ||
} | ||
- (instancetype)init | ||
|
@@ -114,13 +115,14 @@ - (instancetype)init | |
if (self) | ||
{ | ||
_stubDescriptors = [NSMutableArray array]; | ||
_enabledStateNumber = @YES; // assume initialize has already been run | ||
} | ||
return self; | ||
} | ||
|
||
- (void)dealloc | ||
{ | ||
[self.class setEnabled:NO]; | ||
[self.class _setEnable:NO]; | ||
} | ||
|
||
//////////////////////////////////////////////////////////////////////////////// | ||
|
@@ -149,18 +151,26 @@ +(void)removeAllStubs | |
|
||
#pragma mark > Disabling & Re-Enabling stubs | ||
|
||
+(void)setEnabled:(BOOL)enable | ||
+(void)_setEnable:(BOOL)enable | ||
{ | ||
static BOOL currentEnabledState = NO; | ||
if (enable && !currentEnabledState) | ||
if (enable) | ||
{ | ||
[NSURLProtocol registerClass:OHHTTPStubsProtocol.class]; | ||
} | ||
else if (!enable && currentEnabledState) | ||
else | ||
{ | ||
[NSURLProtocol unregisterClass:OHHTTPStubsProtocol.class]; | ||
} | ||
currentEnabledState = enable; | ||
} | ||
|
||
+(void)setEnabled:(BOOL)enabled | ||
{ | ||
[OHHTTPStubs.sharedInstance setEnabled:enabled]; | ||
} | ||
|
||
+(BOOL)isEnabled | ||
{ | ||
return OHHTTPStubs.sharedInstance.isEnabled; | ||
} | ||
|
||
#if defined(__IPHONE_7_0) || defined(__MAC_10_9) | ||
|
@@ -189,6 +199,31 @@ + (void)setEnabled:(BOOL)enable forSessionConfiguration:(NSURLSessionConfigurati | |
@"this method if the user is running iOS7+/OSX9+.", NSStringFromSelector(_cmd)); | ||
} | ||
} | ||
|
||
+ (BOOL)isEnabledForSessionConfiguration:(NSURLSessionConfiguration *)sessionConfig | ||
{ | ||
// Runtime check to make sure the API is available on this version | ||
if ( [sessionConfig respondsToSelector:@selector(protocolClasses)] | ||
&& [sessionConfig respondsToSelector:@selector(setProtocolClasses:)]) | ||
{ | ||
NSMutableArray * urlProtocolClasses = [NSMutableArray arrayWithArray:sessionConfig.protocolClasses]; | ||
Class protoCls = OHHTTPStubsProtocol.class; | ||
if ([urlProtocolClasses containsObject:protoCls]) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why not directly There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Good point! |
||
{ | ||
return YES; | ||
} else | ||
{ | ||
return NO; | ||
} | ||
} | ||
else | ||
{ | ||
NSLog(@"[OHHTTPStubs] %@ is only available when running on iOS7+/OSX9+. " | ||
@"Use conditions like 'if ([NSURLSessionConfiguration class])' to only call " | ||
@"this method if the user is running iOS7+/OSX9+.", NSStringFromSelector(_cmd)); | ||
return NO; | ||
} | ||
} | ||
#endif | ||
|
||
#pragma mark > Debug Methods | ||
|
@@ -208,6 +243,25 @@ +(void)onStubActivation:( nullable void(^)(NSURLRequest* request, id<OHHTTPStubs | |
//////////////////////////////////////////////////////////////////////////////// | ||
#pragma mark - Private instance methods | ||
|
||
-(BOOL)isEnabled | ||
{ | ||
BOOL enabled = NO; | ||
@synchronized(self) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Using |
||
{ | ||
enabled = _enabledStateNumber.boolValue; | ||
} | ||
return enabled; | ||
} | ||
|
||
-(void)setEnabled:(BOOL)enable | ||
{ | ||
@synchronized(self) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Same as above |
||
{ | ||
_enabledStateNumber = @(enable); | ||
[self.class _setEnable:enable]; | ||
} | ||
} | ||
|
||
-(void)addStub:(OHHTTPStubsDescriptor*)stubDesc | ||
{ | ||
@synchronized(_stubDescriptors) | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why not using a
BOOL
, as it will be initialized toYES
at init time so you don't really need theYES/NO/nil
tri-state anyway?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, that seems obvious now. I originally wrote it intending to do
@synchronized(_enabledState)
when I didn't fully understand the@synchronized()
directive. Anyways, updated with another commit.