Fixed issue xing#17 Email link detection does not work properly? and x…

…ing#12 Ignore Acronym in URL detection
maodd · Feb 2, 2016 · 8bafc9b · 8bafc9b
1 parent 46c9237
commit 8bafc9b
Show file tree

Hide file tree

Showing 9 changed files with 12,933 additions and 10,422 deletions.
diff --git a/Example/Example.xcodeproj/project.pbxproj b/Example/Example.xcodeproj/project.pbxproj
@@ -37,6 +37,8 @@
 		C0E302D01AE7A37600F66915 /* single_header.txt in Resources */ = {isa = PBXBuildFile; fileRef = C0E302CF1AE7A37600F66915 /* single_header.txt */; };
 		C0E302D11AE7A37B00F66915 /* single_header.txt in Resources */ = {isa = PBXBuildFile; fileRef = C0E302CF1AE7A37600F66915 /* single_header.txt */; };
 		E515B8D61C600F580038B622 /* lists.txt in Resources */ = {isa = PBXBuildFile; fileRef = E515B8D51C600F580038B622 /* lists.txt */; };
+		E515B8D81C61240B0038B622 /* links_ex.txt in Resources */ = {isa = PBXBuildFile; fileRef = E515B8D71C61240B0038B622 /* links_ex.txt */; };
+		E515B8D91C6126090038B622 /* links_ex.txt in Resources */ = {isa = PBXBuildFile; fileRef = E515B8D71C61240B0038B622 /* links_ex.txt */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -81,6 +83,7 @@
 		C0CF278919CB2300005EF111 /* SnapshotTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SnapshotTests.m; sourceTree = "<group>"; };
 		C0E302CF1AE7A37600F66915 /* single_header.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = single_header.txt; sourceTree = "<group>"; };
 		E515B8D51C600F580038B622 /* lists.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = lists.txt; sourceTree = "<group>"; };
+		E515B8D71C61240B0038B622 /* links_ex.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = links_ex.txt; sourceTree = "<group>"; };
 		F373E2C1346E4E0B8B708C6D /* libPods-Example.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Example.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
@@ -191,6 +194,7 @@
 			children = (
 				C09F673C19DADE7E009CE501 /* headers.txt */,
 				C09F674219DAE77D009CE501 /* links.txt */,
+				E515B8D71C61240B0038B622 /* links_ex.txt */,
 				C09F674319DAE77D009CE501 /* text_styles.txt */,
 				C09F674B19DBE3F5009CE501 /* plaintext_utf8.txt */,
 				C09F674F19DBE6F9009CE501 /* paragraph_1.txt */,
@@ -295,6 +299,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				C09F674719DAE98E009CE501 /* links.txt in Resources */,
+				E515B8D91C6126090038B622 /* links_ex.txt in Resources */,
 				C09F675719DBF78D009CE501 /* plaintext_utf8.txt in Resources */,
 				C0E302D11AE7A37B00F66915 /* single_header.txt in Resources */,
 				C0CF276F19CB2300005EF111 /* InfoPlist.strings in Resources */,
@@ -311,6 +316,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				C09F675519DBE882009CE501 /* all_together_short.txt in Resources */,
+				E515B8D81C61240B0038B622 /* links_ex.txt in Resources */,
 				C0E302D01AE7A37600F66915 /* single_header.txt in Resources */,
 				E515B8D61C600F580038B622 /* lists.txt in Resources */,
 				C0CF278819CB2300005EF111 /* InfoPlist.strings in Resources */,

diff --git a/Example/ExampleTests/Fixtures/links_ex.txt b/Example/ExampleTests/Fixtures/links_ex.txt
@@ -0,0 +1,13 @@
+Domain in email
+===============
+
+https://www.xing.com/root/path
+xing.com/root/path
+@xing.com/root/path
+[email protected]
+link inside parenthesis -> [Text] (http://google.com "alt text") urls
+
+Acronym vs. Link
+==================
+
+Acronym like U.S.A. should not be parsed as link.
diff --git a/Example/ExampleTests/ReferenceImages/ExampleTests/[email protected] b/Example/ExampleTests/ReferenceImages/ExampleTests/[email protected]
diff --git a/Example/ExampleTests/SnapshotTests.m b/Example/ExampleTests/SnapshotTests.m
@@ -33,6 +33,10 @@ - (void)testLinks {
     FBSnapshotVerifyView([self labelForMarkdownStringWithDefaultAttributesFromFile:@"links.txt"], nil);
 }
 
+- (void)testLinksEx {
+    FBSnapshotVerifyView([self labelForMarkdownStringWithDefaultAttributesFromFile:@"links_ex.txt"], nil);
+}
+
 - (void)testTextStyles {
     FBSnapshotVerifyView([self labelForMarkdownStringWithDefaultAttributesFromFile:@"text_styles.txt"], nil);
 }

diff --git a/Example/ObjectiveC.gcda b/Example/ObjectiveC.gcda
diff --git a/Example/ObjectiveC.gcno b/Example/ObjectiveC.gcno
diff --git a/grammar/markdown.grammar b/grammar/markdown.grammar
@@ -37,10 +37,10 @@ bulletstart    ^[\*+-]+[ ]
 codeline       [ ]
 
 protocol       (http|ftp)s?\:\/\/
-subdomain      {nmchar}+\.
+subdomain      [\@]?{nmchar}{2,}\.
 urlpath        [\/]|{nmchar}+
 protourl       {protocol}[^ \n]+
-optprotourl    {protocol}?{subdomain}*{nmchar}+\.{nmchar}+{urlpath}*?
+optprotourl    {subdomain}+{urlpath}*?
 href           \[(\\\[|[^\[])+\]\(([^\)]+)\)
 
 em             {em1}|{em2}

diff --git a/src/XNGMarkdownParser.m b/src/XNGMarkdownParser.m
@@ -342,6 +342,11 @@ - (void)consumeToken:(XNGMarkdownParserCode)token text:(char *)text {
             break;
         }
         case MARKDOWN_URL: {
+
+            if ([textAsString hasPrefix:@"@"]) {
+                break;
+            }
+
             XNGMarkdownLink *link = [[XNGMarkdownLink alloc] init];
             link.url = textAsString;
             link.range = NSMakeRange(_accum.length, textAsString.length);

diff --git a/src/XNGMarkdownTokenizer.m b/src/XNGMarkdownTokenizer.m