Merge pull request #154 from button/pr132

Continue Looking for Route Handler until match handles it (#131)

Author: wessmith

DeepLinkKit.xcodeproj/project.pbxproj

@@ -30,6 +30,7 @@
 		62EE96F71B570B13003D7564 /* DPLProduct.m in Sources */ = {isa = PBXBuildFile; fileRef = DE87B1F01A5DF49F00204A35 /* DPLProduct.m */; };
 		62EE96F81B570B16003D7564 /* DPLProductTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = DEAD327A19E079D3003C8D65 /* DPLProductTableViewController.m */; };
 		BFDB96F71F3C0011001AE303 /* NSString+DPLTrim.m in Sources */ = {isa = PBXBuildFile; fileRef = DE16E91B1A42720D00077E18 /* NSString+DPLTrim.m */; };
+		69E6850D1F1015F900D6D8CC /* DPLWontHandleRouteHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 69E6850C1F1015F900D6D8CC /* DPLWontHandleRouteHandler.m */; };
 		BFDB96F81F3C0011001AE303 /* NSString+DPLQuery.m in Sources */ = {isa = PBXBuildFile; fileRef = DE058E081A3B46F500147C04 /* NSString+DPLQuery.m */; };
 		BFDB96F91F3C0011001AE303 /* NSString+DPLJSON.m in Sources */ = {isa = PBXBuildFile; fileRef = DE3E61091A3B4485008D6DFC /* NSString+DPLJSON.m */; };
 		BFDB96FA1F3C0011001AE303 /* NSObject+DPLJSONObject.m in Sources */ = {isa = PBXBuildFile; fileRef = DECB32511A87E94B0071C76E /* NSObject+DPLJSONObject.m */; };
@@ -119,6 +120,8 @@
 		62891E8A1B57FE5A00C2AF4F /* DPLMessageRouteHandler.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DPLMessageRouteHandler.swift; sourceTree = "<group>"; };
 		62EE96F11B57011D003D7564 /* ReceiverDemoSwift-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "ReceiverDemoSwift-Bridging-Header.h"; sourceTree = "<group>"; };
 		62EE96F31B570891003D7564 /* DPLProductRouteHandler.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DPLProductRouteHandler.swift; sourceTree = "<group>"; };
+		69E6850B1F1015F900D6D8CC /* DPLWontHandleRouteHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DPLWontHandleRouteHandler.h; sourceTree = "<group>"; };
+		69E6850C1F1015F900D6D8CC /* DPLWontHandleRouteHandler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DPLWontHandleRouteHandler.m; sourceTree = "<group>"; };
 		83D34C3B1B03ECAD00BA6EF1 /* DPLMatchResult.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DPLMatchResult.h; sourceTree = "<group>"; };
 		83D34C3C1B03ECAD00BA6EF1 /* DPLMatchResult.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DPLMatchResult.m; sourceTree = "<group>"; };
 		83D34C3D1B03ECAD00BA6EF1 /* DPLRegularExpression.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DPLRegularExpression.h; sourceTree = "<group>"; };
@@ -474,6 +477,8 @@
 			isa = PBXGroup;
 			children = (
 				DE16E9271A42883B00077E18 /* DPLDeepLinkRouter_Private.h */,
+				69E6850B1F1015F900D6D8CC /* DPLWontHandleRouteHandler.h */,
+				69E6850C1F1015F900D6D8CC /* DPLWontHandleRouteHandler.m */,
 			);
 			path = Helpers;
 			sourceTree = "<group>";
@@ -1163,6 +1168,7 @@
 				4D4F412B1B02A96400B710DB /* DPLRegularExpressionSpec.m in Sources */,
 				DECB32531A881CA10071C76E /* NSObject_DPLJSONObjectSpec.m in Sources */,
 				DEEBD4A91AAB7946000BCA84 /* DPLSerializableObject.m in Sources */,
+				69E6850D1F1015F900D6D8CC /* DPLWontHandleRouteHandler.m in Sources */,
 				DE058E101A3B485500147C04 /* DPLDeepLinkSpec.m in Sources */,
 				DECB32551A882D1A0071C76E /* DPLMutableDeepLinkSpec.m in Sources */,
 				DE058E0A1A3B46FD00147C04 /* NSString_DPLQuerySpec.m in Sources */,

DeepLinkKit/Router/DPLDeepLinkRouter.m

@@ -127,7 +127,9 @@ - (BOOL)handleURL:(NSURL *)url withCompletion:(DPLRouteCompletionBlock)completio
         deepLink = [matcher deepLinkWithURL:url];
         if (deepLink) {
             isHandled = [self handleRoute:route withDeepLink:deepLink error:&error];
-            break;
+            if (isHandled) {
+                break;
+            }
         }
     }
 

Tests/Router/DPLDeepLinkRouterSpec.m

@@ -3,6 +3,7 @@
 #import "DPLRouteHandler.h"
 #import "DPLDeepLink.h"
 #import "DPLErrors.h"
+#import "DPLWontHandleRouteHandler.h"
 
 SpecBegin(DPLDeepLinkRouter)
 
@@ -139,6 +140,25 @@
         });
     });
 
+    it(@"continues looking for a match which will handle the route, even if the first match chooses not to handle it", ^{
+        waitUntil(^(DoneCallback done) {
+            [router registerHandlerClass:[DPLWontHandleRouteHandler class] forRoute:@"/say/hello"];
+
+            __block BOOL didMatchOnSecondRegistration = NO;
+            router[@"/say/:word"] = ^{
+                didMatchOnSecondRegistration = YES;
+            };
+            
+            BOOL isHandled = [router handleURL:url withCompletion:^(BOOL handled, NSError *error) {
+                expect(handled).to.beTruthy();
+                expect(error).to.beNil();
+                done();
+            }];
+            expect(didMatchOnSecondRegistration).to.beTruthy();
+            expect(isHandled).to.beTruthy();
+        });
+    });
+    
     it(@"matches less specfic routes first when they are registered first", ^{
         waitUntil(^(DoneCallback done) {
             router[@"/say/:word"] = ^(DPLDeepLink *deepLink) {
@@ -157,7 +177,7 @@
             expect(isHandled).to.beTruthy();
         });
     });
-    
+
     it(@"produces an error when a URL has no matching route", ^{
         waitUntil(^(DoneCallback done) {
             BOOL isHandled = [router handleURL:url withCompletion:^(BOOL handled, NSError *error) {
@@ -168,12 +188,12 @@
             expect(isHandled).to.beFalsy();
         });
     });
-    
+
     it(@"produces an error when a route handler does not specify a target view controller", ^{
         waitUntil(^(DoneCallback done) {
-            
+
             router[@"/say/:word"] = [DPLRouteHandler class];
-            
+
             BOOL isHandled = [router handleURL:url withCompletion:^(BOOL handled, NSError *error) {
                 expect(handled).to.beFalsy();
                 expect(error.code).to.equal(DPLRouteHandlerTargetNotSpecifiedError);

Tests/Router/Helpers/DPLWontHandleRouteHandler.h

@@ -0,0 +1,5 @@
+#import "DPLRouteHandler.h"
+
+@interface DPLWontHandleRouteHandler : DPLRouteHandler
+
+@end

Tests/Router/Helpers/DPLWontHandleRouteHandler.m

@@ -0,0 +1,9 @@
+#import "DPLWontHandleRouteHandler.h"
+
+@implementation DPLWontHandleRouteHandler
+
+- (BOOL)shouldHandleDeepLink:(DPLDeepLink *)deepLink {
+    return NO;
+}
+
+@end