Merge pull request #9 from swift-tweets/dev-0.1.1

Develop 0.1.1
swift-tweets · Nov 3, 2017 · f29d392 · f29d392
2 parents 0420a91 + 19b69ac
commit f29d392
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 3 deletions.
diff --git a/Sources/CodeRenderer.swift b/Sources/CodeRenderer.swift
@@ -15,7 +15,7 @@ internal class CodeRenderer: NSObject {
         zelf = self
 
         DispatchQueue.main.async {
-            self.webView = WebView(frame: NSRect(x: 0, y: 0, width: 414, height: CodeRenderer.height))
+            self.webView = WebView(frame: NSRect(x: 0, y: 0, width: 640, height: CodeRenderer.height))
             self.webView.frameLoadDelegate = self
             self.webView.customUserAgent = "Mozilla/5.0 (iPhone; CPU iPhone OS 9_1 like Mac OS X) AppleWebKit/601.1.46 (KHTML, like Gecko) Version/9.0 Mobile/13B143 Safari/601.1"
             self.webView.mainFrameURL = url

diff --git a/Sources/Tweet.swift b/Sources/Tweet.swift
@@ -1,7 +1,7 @@
 import Foundation
 
 public struct Tweet {
-    internal static let urlPattern = try! NSRegularExpression(pattern: "(^|\\s)(http(s)?://[a-zA-Z0-9~!@#$%&*-_=+\\[\\]|:;',./?]*)($|\\s)")
+    internal static let urlPattern = try! NSRegularExpression(pattern: "(^|\\s)((http(s)?://)?[a-zA-Z0-9\\-]+(\\.[a-zA-Z0-9\\-]+)+(/[a-zA-Z0-9~!@#$%&*\\-_=+\\[\\]|:;',./?]*)?)($|\\s)")
     internal static let urlLength = 23
     internal static let maxLength = 140
 
@@ -19,7 +19,7 @@ public struct Tweet {
 
     public var length: Int {
         let replaced = NSMutableString(string: body)
-        let numberOfUrls = Tweet.urlPattern.replaceMatches(in: replaced, options: [], range: NSMakeRange(0, replaced.length), withTemplate: "$1$4")
+        let numberOfUrls = Tweet.urlPattern.replaceMatches(in: replaced, options: [], range: NSMakeRange(0, replaced.length), withTemplate: "$1$7")
 
         let normalized = replaced.precomposedStringWithCanonicalMapping as NSString
 

diff --git a/Tests/TweetupKitTests/TweetTests.swift b/Tests/TweetupKitTests/TweetTests.swift
@@ -55,6 +55,17 @@ class TweetTests: XCTestCase {
         } catch {
             XCTFail()
         }
+
+        do { // Swift.org as a URL
+            _ = try Tweet(body: "まず Swift.org の Compiler and Standard Library を見てみました。\n> Semantic analysis includes type inference ...\nhttps://swift.org/compiler-stdlib/#compiler-architecture (6/10) #swtws")
+            XCTFail()
+        } catch let TweetInitializationError.tooLong(body, attachment, length) {
+            XCTAssertEqual(body, "まず Swift.org の Compiler and Standard Library を見てみました。\n> Semantic analysis includes type inference ...\nhttps://swift.org/compiler-stdlib/#compiler-architecture (6/10) #swtws")
+            XCTAssertNil(attachment)
+            XCTAssertEqual(length, 153)
+        } catch {
+            XCTFail()
+        }
     }
 
     func testDescription() {
@@ -150,5 +161,22 @@ class TweetTests: XCTestCase {
                 XCTAssertEqual((string as NSString).substring(with: result.rangeAt(2)), "https://swift-tweets.github.io/?foo=bar&baz=qux#tweeters")
             }
         }
+
+        do {
+            let string = "まず Swift.org の Compiler and Standard Library を見てみました。\n> Semantic analysis includes type inference ...\nhttps://swift.org/compiler-stdlib/#compiler-architecture (6/10) #swtws"
+
+            let results = Tweet.urlPattern.matches(in: string)
+            XCTAssertEqual(results.count, 2)
+
+            do {
+                let result = results[0]
+                XCTAssertEqual((string as NSString).substring(with: result.rangeAt(2)), "Swift.org")
+            }
+
+            do {
+                let result = results[1]
+                XCTAssertEqual((string as NSString).substring(with: result.rangeAt(2)), "https://swift.org/compiler-stdlib/#compiler-architecture")
+            }
+        }
     }
 }