Added an option to control how URL host is treated (#89)

joeldev · Apr 8, 2017 · 1af2a1c · 1af2a1c
1 parent b2e2d24
commit 1af2a1c
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 7 deletions.
diff --git a/JLRoutes/Classes/JLRRouteRequest.h b/JLRoutes/Classes/JLRRouteRequest.h
@@ -24,7 +24,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, strong, readonly) NSArray *pathComponents;
 @property (nonatomic, strong, readonly) NSDictionary *queryParams;
 
-- (instancetype)initWithURL:(NSURL *)URL;
+- (instancetype)initWithURL:(NSURL *)URL alwaysTreatsHostAsPathComponent:(BOOL)alwaysTreatsHostAsPathComponent;
 
 + (NSString *)variableValueFrom:(NSString *)value decodePlusSymbols:(BOOL)decodePlusSymbols;
 

diff --git a/JLRoutes/Classes/JLRRouteRequest.m b/JLRoutes/Classes/JLRRouteRequest.m
@@ -24,14 +24,14 @@ @interface JLRRouteRequest ()
 
 @implementation JLRRouteRequest
 
-- (instancetype)initWithURL:(NSURL *)URL
+- (instancetype)initWithURL:(NSURL *)URL alwaysTreatsHostAsPathComponent:(BOOL)alwaysTreatsHostAsPathComponent
 {
     if ((self = [super init])) {
         self.URL = URL;
 
         NSURLComponents *components = [NSURLComponents componentsWithString:[self.URL absoluteString]];
 
-        if (components.host.length > 0 && ![components.host isEqualToString:@"localhost"] && [components.host rangeOfString:@"."].location == NSNotFound) {
+        if (components.host.length > 0 && (alwaysTreatsHostAsPathComponent || (![components.host isEqualToString:@"localhost"] && [components.host rangeOfString:@"."].location == NSNotFound))) {
             // convert the host to "/" so that the host is considered a path component
             NSString *host = [components.percentEncodedHost copy];
             components.host = @"/";

diff --git a/JLRoutes/JLRoutes.h b/JLRoutes/JLRoutes.h
@@ -155,6 +155,12 @@ extern NSString *const JLRoutesGlobalRoutesScheme;
 /// Returns if '+' should be replaced with spaces in parsed values. Defaults to YES.
 + (BOOL)shouldDecodePlusSymbols;
 
+/// Configures if URL host is always considered to be a path component. Defaults to NO.
++ (void)setAlwaysTreatsHostAsPathComponent:(BOOL)treatsHostAsPathComponent;
+
+/// Returns if URL host is always considered to be a path component. Defaults to NO.
++ (BOOL)alwaysTreatsHostAsPathComponent;
+
 @end
 
 

diff --git a/JLRoutes/JLRoutes.m b/JLRoutes/JLRoutes.m
@@ -27,6 +27,7 @@
 // global options
 static BOOL verboseLoggingEnabled = NO;
 static BOOL shouldDecodePlusSymbols = YES;
+static BOOL alwaysTreatsHostAsPathComponent = NO;
 
 
 @interface JLRoutes ()
@@ -258,7 +259,7 @@ - (BOOL)_routeURL:(NSURL *)URL withParameters:(NSDictionary *)parameters execute
     [self _verboseLog:@"Trying to route URL %@", URL];
 
     BOOL didRoute = NO;
-    JLRRouteRequest *request = [[JLRRouteRequest alloc] initWithURL:URL];
+    JLRRouteRequest *request = [[JLRRouteRequest alloc] initWithURL:URL alwaysTreatsHostAsPathComponent:alwaysTreatsHostAsPathComponent];
 
     for (JLRRouteDefinition *route in [self.mutableRoutes copy]) {
         // check each route for a matching response
@@ -356,6 +357,16 @@ + (BOOL)shouldDecodePlusSymbols
     return shouldDecodePlusSymbols;
 }
 
++ (void)setAlwaysTreatsHostAsPathComponent:(BOOL)treatsHostAsPathComponent
+{
+    alwaysTreatsHostAsPathComponent = treatsHostAsPathComponent;
+}
+
++ (BOOL)alwaysTreatsHostAsPathComponent
+{
+    return alwaysTreatsHostAsPathComponent;
+}
+
 @end
 
 

diff --git a/JLRoutesTests/JLRoutesTests.m b/JLRoutesTests/JLRoutesTests.m
@@ -75,6 +75,7 @@ - (void)setUp
 
     // reset settings
     [JLRoutes setShouldDecodePlusSymbols:YES];
+    [JLRoutes setAlwaysTreatsHostAsPathComponent:NO];
 }
 
 - (void)tearDown
@@ -775,10 +776,14 @@ - (void)testAddingCustomRouteDefinition
     JLValidateScheme(JLRoutesGlobalRoutesScheme);
 }
 
-- (void)testShouldTreatHostAsPathComponent
+- (void)testTreatsHostAsPathComponent
 {
-    [[JLRoutes globalRoutes] addRoute:@"/sign_in" handler:[[self class] defaultRouteHandler]];
-    [[JLRoutes globalRoutes] addRoute:@"/path/:pathid" handler:[[self class] defaultRouteHandler]];
+    id defaultHandler = [[self class] defaultRouteHandler];
+
+    [[JLRoutes globalRoutes] addRoute:@"/sign_in" handler:defaultHandler];
+    [[JLRoutes globalRoutes] addRoute:@"/path/:pathid" handler:defaultHandler];
+
+    [JLRoutes setAlwaysTreatsHostAsPathComponent:NO];
 
     [self route:@"https://www.mydomain.com/sign_in"];
     JLValidateAnyRouteMatched();
@@ -788,6 +793,26 @@ - (void)testShouldTreatHostAsPathComponent
     JLValidateAnyRouteMatched();
     JLValidatePattern(@"/path/:pathid");
     JLValidateParameter((@{@"pathid": @"3"}));
+
+    [JLRoutes setAlwaysTreatsHostAsPathComponent:YES];
+
+    [self route:@"https://www.mydomain2.com/sign_in"];
+    JLValidateNoLastMatch();
+
+    [self route:@"https://www.mydomain2.com/path/3"];
+    JLValidateNoLastMatch();
+
+    [[JLRoutes globalRoutes] addRoute:@"/www.mydomain2.com/sign_in" handler:defaultHandler];
+    [[JLRoutes globalRoutes] addRoute:@"/www.mydomain2.com/path/:pathid" handler:defaultHandler];
+
+    [self route:@"https://www.mydomain2.com/sign_in"];
+    JLValidateAnyRouteMatched();
+    JLValidatePattern(@"/www.mydomain2.com/sign_in");
+
+    [self route:@"https://www.mydomain2.com/path/3"];
+    JLValidateAnyRouteMatched();
+    JLValidatePattern(@"/www.mydomain2.com/path/:pathid");
+    JLValidateParameter((@{@"pathid": @"3"}));
 }
 
 #pragma mark - Convenience Methods