Merge pull request #9 from heidipuk/update-to-vapor3

Update to vapor3

.circleci/config.yml

@@ -2,18 +2,19 @@ version: 2
 jobs:
   MacOS:
     macos:
-      xcode: "9.0"
+      xcode: "10.0"
     steps:
       - checkout
       - restore_cache:
           keys:
             - v1-spm-deps-{{ checksum "Package.swift" }}
       - run:
-          name: Install CMySQL and CTLS
+          name: Install dependencies
           command: |
             brew tap vapor/homebrew-tap
             brew install cmysql
             brew install ctls
+            brew install libressl
       - run:
           name: Build and Run Tests
           no_output_timeout: 1800
@@ -30,22 +31,22 @@ jobs:
             - .build
   Linux:
     docker:
-      - image: brettrtoomey/vapor-ci:0.0.1
+      - image: nodesvapor/vapor-ci:swift-4.2
     steps:
       - checkout
       - restore_cache:
           keys:
             - v2-spm-deps-{{ checksum "Package.swift" }}
       - run:
-          name: Copy Package file
+          name: Copy Package File
           command: cp Package.swift res
       - run:
           name: Build and Run Tests
           no_output_timeout: 1800
           command: |
             swift test -Xswiftc -DNOJSON
       - run:
-          name: Restoring Package file
+          name: Restoring Package File
           command: mv res Package.swift
       - save_cache:
           key: v2-spm-deps-{{ checksum "Package.swift" }}

.gitignore

@@ -23,6 +23,8 @@ xcuserdata/
 ## Other
 *.moved-aside
 *.xcuserstate
+test.Dockerfile
+dockerTest.sh
 
 ## Obj-C/Swift specific
 *.hmap
@@ -39,6 +41,7 @@ playground.xcworkspace
 # Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
 # Packages/
 .build/
+Package.resolved
 
 # CocoaPods
 #

Package.swift

@@ -1,8 +1,23 @@
+// swift-tools-version:4.2
+
 import PackageDescription
 
 let package = Package(
     name: "DataURI",
+    products: [
+        .library(name: "DataURI", targets: ["DataURI"])
+    ],
     dependencies: [
-        .Package(url: "https://github.com/vapor/vapor.git", majorVersion: 2),
+        .package(url: "https://github.com/vapor/core.git", from: "3.0.0"),
+    ],
+    targets: [
+        .target(
+        name: "DataURI",
+        dependencies: ["Core"]
+        ),
+        .testTarget(
+        name: "DataURITests",
+        dependencies: ["DataURI"]
+        )
     ]
 )

README.md

@@ -1,6 +1,6 @@
 # DataURI
-[![Swift Version](https://img.shields.io/badge/Swift-3-brightgreen.svg)](http://swift.org)
-[![Vapor Version](https://img.shields.io/badge/Vapor-2-F6CBCA.svg)](http://vapor.codes)
+[![Swift Version](https://img.shields.io/badge/Swift-4.2-brightgreen.svg)](http://swift.org)
+[![Vapor Version](https://img.shields.io/badge/Vapor-3-30B6FC.svg)](http://vapor.codes)
 [![Circle CI](https://circleci.com/gh/nodes-vapor/data-uri/tree/master.svg?style=shield)](https://circleci.com/gh/nodes-vapor/data-uri)
 [![codebeat badge](https://codebeat.co/badges/7f0cab4f-f11b-43d5-8484-bc9300c23d81)](https://codebeat.co/projects/github-com-nodes-vapor-data-uri-master)
 [![codecov](https://codecov.io/gh/nodes-vapor/data-uri/branch/master/graph/badge.svg)](https://codecov.io/gh/nodes-vapor/data-uri)
@@ -14,7 +14,7 @@ A pure Swift parser for Data URIs.
 
 Update your `Package.swift` file.
 ```swift
-.Package(url: "https://github.com/nodes-vapor/data-uri.git", majorVersion: 1)
+.package(url: "https://github.com/nodes-vapor/data-uri.git", from: "2.0.0")
 ```
 
 

Sources/DataURI/Byte+asciiCode.swift

@@ -0,0 +1,14 @@
+public typealias Byte = UInt8
+public typealias Bytes = [Byte]
+
+extension Byte {
+    internal var asciiCode: Byte {
+        if self >= 48 && self <= 57 {
+            return self - 48
+        } else if self >= 65 && self <= 70 {
+            return self - 55
+        } else {
+            return 0
+        }
+    }
+}

Sources/DataURI+String.swift → Sources/DataURI/DataURI+String.swift

@@ -1,4 +1,3 @@
-import Core
 import Foundation
 
 extension String {
@@ -11,4 +10,9 @@ extension String {
         let (data, type, _) = try DataURIParser.parse(uri: self)
         return (data, type.makeString())
     }
+
+    /// Converts the string to a UTF8 array of bytes.
+    public var bytes: [UInt8] {
+        return [UInt8](self.utf8)
+    }
 }

Sources/Parser.swift → Sources/DataURI/Parser.swift

@@ -6,7 +6,6 @@ public struct DataURIParser {
         case invalidScheme
         case invalidURI
     }
-
     var scanner: Scanner<Byte>
 
     init(scanner: Scanner<Byte>) {
@@ -41,10 +40,13 @@ extension DataURIParser {
             type = "text/plain;charset=US-ASCII".bytes
         }
 
-        if let typeMetadata = typeMetadata, typeMetadata == "base64".bytes {
-            data = data.base64Decoded
+        if typeMetadata == "base64".bytes,
+            let decodedData = Data(base64Encoded: data.convertToData()),
+            let dataString = String(data: decodedData, encoding: .utf8)
+        {
+            data = dataString.bytes
         }
-        
+
         return (data, type, typeMetadata)
     }
 }
@@ -150,15 +152,3 @@ extension DataURIParser {
         return (leftMostDigit.asciiCode * 16) + rightMostDigit.asciiCode
     }
 }
-
-extension Byte {
-    internal var asciiCode: Byte {
-        if self >= 48 && self <= 57 {
-            return self - 48
-        } else if self >= 65 && self <= 70 {
-            return self - 55
-        } else {
-            return 0
-        }
-    }
-}

Sources/DataURI/Sequence+makeString.swift

@@ -0,0 +1,12 @@
+extension Sequence where Iterator.Element == Byte {
+    /// Converts a slice of bytes to
+    /// string. Courtesy of Vapor 2 - Core and @vzsg
+    public func makeString() -> String {
+        let array = Array(self) + [0]
+
+        return array.withUnsafeBytes { rawBuffer in
+            guard let pointer = rawBuffer.baseAddress?.assumingMemoryBound(to: CChar.self) else { return nil }
+            return String(validatingUTF8: pointer)
+            } ?? ""
+    }
+}

Tests/DataURITests/DataURITests.swift

@@ -14,13 +14,6 @@ class DataURITests: XCTestCase {
         ("testSpeed", testSpeed)
     ]
 
-    func testBase64() {
-        //FIXME(Brett): remove when vapor/core is updated to 1.1
-        let base64Bytes: Bytes = "SGVsbG8sIHdvcmxkIQ==".makeBytes()
-        let output: Bytes = base64Bytes.base64URLDecoded
-        XCTAssertEqual(output.makeString(), "Hello, world!")
-    }
-
     func testTextNoType() {
         let (data, type, meta) = try! DataURIParser.parse(
             uri: "data:,Hello%2C%20World!"

Tests/DataURITests/Utilities/Expect.swift

@@ -4,7 +4,7 @@ func expect<E: Error, ReturnType>(
     toThrow expectedError: E,
     file: StaticString = #file,
     line: UInt = #line,
-    from closure: (Void) throws -> ReturnType
+    from closure: () throws -> ReturnType
     ) where E: Equatable {
     do {
         let _ = try closure()
@@ -23,7 +23,7 @@ func expect<E: Error, ReturnType>(
 func expectNoThrow<ReturnType>(
     file: StaticString = #file,
     line: UInt = #line,
-    _ closure: (Void) throws -> ReturnType
+    _ closure: () throws -> ReturnType
     ) {
     do {
         let _ = try closure()
@@ -33,7 +33,7 @@ func expectNoThrow<ReturnType>(
 }
 
 func expect<ReturnType>(
-    _ closure: (Void) throws -> ReturnType,
+    _ closure: () throws -> ReturnType,
     file: StaticString = #file,
     line: UInt = #line,
     toReturn expectedResult: ReturnType

Tests/DataURITests/XCTestManifests.swift

@@ -0,0 +1,37 @@
+import XCTest
+
+extension DataURITests {
+    static let __allTests = [
+        ("testBase64Text", testBase64Text),
+        ("testFailedInvalidScheme", testFailedInvalidScheme),
+        ("testHTMLJavascriptText", testHTMLJavascriptText),
+        ("testHTMLText", testHTMLText),
+        ("testPublicInterface", testPublicInterface),
+        ("testSpeed", testSpeed),
+        ("testTextNoType", testTextNoType),
+    ]
+}
+
+extension ParserTests {
+    static let __allTests = [
+        ("testConsume", testConsume),
+        ("testConsumePercentDecoded", testConsumePercentDecoded),
+        ("testConsumePercentDecodedFailed", testConsumePercentDecodedFailed),
+        ("testConsumeUntil", testConsumeUntil),
+        ("testConsumeWhile", testConsumeWhile),
+        ("testExtractType", testExtractType),
+        ("testExtractTypeFailed", testExtractTypeFailed),
+        ("testExtractTypeMetadata", testExtractTypeMetadata),
+        ("testExtractTypeWithMetadata", testExtractTypeWithMetadata),
+        ("testParserInit", testParserInit),
+    ]
+}
+
+#if !os(macOS)
+public func __allTests() -> [XCTestCaseEntry] {
+    return [
+        testCase(DataURITests.__allTests),
+        testCase(ParserTests.__allTests),
+    ]
+}
+#endif

Tests/LinuxMain.swift

@@ -1,7 +1,8 @@
 import XCTest
-@testable import DataURITests
 
-XCTMain([
-     testCase(DataURITests.allTests),
-     testCase(ParserTests.allTests),
-])
+import DataURITests
+
+var tests = [XCTestCaseEntry]()
+tests += DataURITests.__allTests()
+
+XCTMain(tests)