fix bug of pathComponents from route

lightory · Jun 24, 2016 · 94eddec · 94eddec
1 parent b329c01
commit 94eddec
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 2 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/HHRouter/HHRouter.m b/HHRouter/HHRouter.m
@@ -108,7 +108,7 @@ - (NSDictionary *)paramsInRoute:(NSString *)route
     params[@"route"] = [self stringFromFilterAppUrlScheme:route];
 
     NSMutableDictionary *subRoutes = self.routes;
-    NSArray *pathComponents = [self pathComponentsFromRoute:[self stringFromFilterAppUrlScheme:route]];
+    NSArray *pathComponents = [self pathComponentsFromRoute:params[@"route"]];
     for (NSString *pathComponent in pathComponents) {
         BOOL found = NO;
         NSArray *subRoutesKeys = subRoutes.allKeys;
@@ -174,7 +174,7 @@ - (NSMutableDictionary *)routes
 - (NSArray *)pathComponentsFromRoute:(NSString *)route
 {
     NSMutableArray *pathComponents = [NSMutableArray array];
-    for (NSString *pathComponent in route.pathComponents) {
+    for (NSString *pathComponent in [NSURL URLWithString:route].path.pathComponents) {
         if ([pathComponent isEqualToString:@"/"]) continue;
         if ([[pathComponent substringToIndex:1] isEqualToString:@"?"]) break;
         [pathComponents addObject:pathComponent];

diff --git a/HHRouterExample/.DS_Store b/HHRouterExample/.DS_Store
diff --git a/HHRouterExample/Images.xcassets/.DS_Store b/HHRouterExample/Images.xcassets/.DS_Store