Merge pull request #153 from button/pr144

Pr144
button · May 31, 2019 · c5e737b · c5e737b
2 parents 3b1aaee + 94874fe
commit c5e737b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/DeepLinkKit/Regex/DPLRegularExpression.m b/DeepLinkKit/Regex/DPLRegularExpression.m
@@ -1,6 +1,6 @@
 #import "DPLRegularExpression.h"
 
-static NSString * const DPLNamedGroupComponentPattern = @":[a-zA-Z0-9-_][^/]+";
+static NSString * const DPLNamedGroupComponentPattern = @":[a-zA-Z0-9-_]+[^/]*";
 static NSString * const DPLRouteParameterPattern = @":[a-zA-Z0-9-_]+";
 static NSString * const DPLURLParameterPattern = @"([^/]+)";
 

diff --git a/Tests/Regex/DPLRegularExpressionSpec.m b/Tests/Regex/DPLRegularExpressionSpec.m
@@ -40,7 +40,16 @@
  DPLMatchResult *matchResult = [expression matchResultForString:@"/hello/dovalue/thisvalue/and/thatvalue"];
  expect(matchResult.match).to.beFalsy();
  });
-
+
+ it(@"should match named components with single character", ^{
+ DPLRegularExpression *expression = [DPLRegularExpression regularExpressionWithPattern:@"/hello/:a/:b/and/:c"];
+
+ DPLMatchResult *matchResult = [expression matchResultForString:@"/hello/dovalue/thisvalue/and/thatvalue"];
+ expect(matchResult.match).to.beTruthy();
+ expect(matchResult.namedProperties).to.equal(@{ @"a": @"dovalue",
+ @"b": @"thisvalue",
+ @"c": @"thatvalue" });
+ });
 });
 
 SpecEnd