Merge pull request #5 from justinmakaila/master

Added method for checking for matches within the receiver with a regex
khanlou · Jun 3, 2014 · 14511c6 · 14511c6
2 parents 6b9b0aa + fcbf58c
commit 14511c6
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 3 deletions.
diff --git a/Objective-Shorthand/Objective-Shorthand/NSString+Regex.h b/Objective-Shorthand/Objective-Shorthand/NSString+Regex.h
@@ -28,4 +28,13 @@
  */
 - (NSRange) rangeOfFirstSubstringMatching:(NSString*)regex;
 
+/**
+ *  Returns an array of NSTextMatchingResults within the receiver
+ *
+ *  @param regex The regular expression pattern to match against.
+ *
+ *  @return An array of NSTextMatchingResults containing the matches from the receiver.
+ */
+- (NSArray*) matchesForRegex:(NSString*)regex;
+
 @end
diff --git a/Objective-Shorthand/Objective-Shorthand/NSString+Regex.m b/Objective-Shorthand/Objective-Shorthand/NSString+Regex.m
@@ -11,14 +11,17 @@
 @implementation NSString (Regex)
 
 - (BOOL) matchesRegex:(NSString*)regex {
-    NSRegularExpression *regularExpression = [NSRegularExpression regularExpressionWithPattern:regex options:0 error:nil];
-    NSUInteger numberOfMatches = [regularExpression numberOfMatchesInString:self options:0 range:NSMakeRange(0, self.length)];
-    return numberOfMatches > 0;
+    return ([self matchesForRegex:regex].count > 0);
 }
 
 - (NSRange) rangeOfFirstSubstringMatching:(NSString*)regex {
     NSRegularExpression *regularExpression = [NSRegularExpression regularExpressionWithPattern:regex options:0 error:nil];
     return [regularExpression rangeOfFirstMatchInString:self options:0 range:NSMakeRange(0, self.length)];
 }
 
+- (NSArray*) matchesForRegex:(NSString *)regex {
+    NSRegularExpression *regularExpression = [NSRegularExpression regularExpressionWithPattern:regex options:0 error:nil];
+    return [regularExpression matchesInString:self options:0 range:NSMakeRange(0, self.length)];
+}
+
 @end
diff --git a/Objective-ShorthandTests/SKRegexCategoryTest.m b/Objective-ShorthandTests/SKRegexCategoryTest.m
@@ -52,4 +52,13 @@ - (void)testNonexistentMatch
     XCTAssertFalse(doesMatch, @"the string test should not be found");
 }
 
+- (void)testMultipleMatches {
+    // Finds all of the matches for a hashtag
+    NSString *testString = @"@justin is gonna make this #work #srsly #sickofthisnotbeingathing";
+
+    NSArray *matches = [testString matchesForRegex:@"#(\\w+)"];
+
+    XCTAssert(matches.count == 3, @"Could not find the 3 provided hashtags");
+}
+
 @end