Merge branch 'release/1.1.7'

Author: colemancda

Sources/SwiftFoundation/Endianness.swift

@@ -27,34 +27,8 @@ public extension EndianConvertible {
     /// Converts the number to the current endianness.
     var currentEndian: Self {
 
-        if isBigEndian {
-            
-            return bigEndian
-            
-        } else {
-            
-            return littleEndian
-        }
+        return isBigEndian ? bigEndian : littleEndian
     }
 }
 
 public let isBigEndian = 10.bigEndian == 10
-
-public extension UInt16 {
-    
-    /// Initializes value from two little endian ordered bytes. 
-    public init(littleEndian value: (UInt8, UInt8)) {
-        
-        self = (UInt16(value.0).littleEndian + UInt16(value.1).bigEndian).currentEndian
-    }
-    
-    public var littleEndianBytes: (UInt8, UInt8) {
-        
-        let value = self.littleEndian
-        
-        let lowerByte = value & 0xff
-        let higherByte = value >> 8
-        
-        return (UInt8(truncatingBitPattern: lowerByte), UInt8(truncatingBitPattern: higherByte))
-    }
-}

Sources/SwiftFoundation/Integer.swift

@@ -25,3 +25,18 @@ public extension Int {
     }
 }
 
+public extension UInt16 {
+    
+    /// Initializes value from two bytes.
+    public init(bytes: (UInt8, UInt8)) {
+        
+        self = unsafeBitCast(bytes, UInt16.self)
+    }
+    
+    /// Converts to two bytes. 
+    public var bytes: (UInt8, UInt8) {
+        
+        return unsafeBitCast(self, (UInt8, UInt8).self)
+    }
+}
+

Sources/SwiftFoundation/UUID.swift

@@ -49,6 +49,25 @@ public extension UUID {
     }
 }
 
+// MARK: - Hashable
+
+extension UUID: Hashable {
+    
+    public var hashValue: Int {
+        
+        // more expensive than casting but that's not safe
+        let integerArray = self.toData().byteValue.map { Int($0) }
+        var hash = 0
+        
+        for integer in integerArray {
+            
+            hash ^= integer
+        }
+        
+        return hash
+    }
+}
+
 // MARK: - DataConvertible
 
 extension UUID: DataConvertible {
@@ -57,7 +76,7 @@ extension UUID: DataConvertible {
 
         let byteValue = data.byteValue
 
-        guard byteValue.count == 16 else { return nil }
+        guard byteValue.count == UUID.ByteCount else { return nil }
 
         self.init(byteValue: (byteValue[0], byteValue[1], byteValue[2], byteValue[3], byteValue[4], byteValue[5], byteValue[6], byteValue[7], byteValue[8], byteValue[9], byteValue[10], byteValue[11], byteValue[12], byteValue[13], byteValue[14], byteValue[15]))
     }
@@ -67,3 +86,12 @@ extension UUID: DataConvertible {
         return Data(byteValue: [byteValue.0, byteValue.1, byteValue.2, byteValue.3, byteValue.4, byteValue.5, byteValue.6, byteValue.7, byteValue.8, byteValue.9, byteValue.10, byteValue.11, byteValue.12, byteValue.13, byteValue.14, byteValue.15])
     }
 }
+
+// MARK: - Private Constants
+
+private extension UUID {
+    
+    private static var StringLength: Int { return 36 }
+    private static var UnformattedUUIDStringLength: Int { return 32 }
+    private static var ByteCount: Int { return 16 }
+}

Sources/UnitTests/UUIDTests.swift

@@ -15,7 +15,8 @@ final class UUIDTests: XCTestCase {
     lazy var allTests: [(String, () throws -> ())] =
         [("testCreateRandomUUID", self.testCreateRandomUUID),
         ("testUUIDString", self.testUUIDString),
-        ("testCreateFromString", self.testCreateFromString)]
+        ("testCreateFromString", self.testCreateFromString),
+        ("testBytes", self.testBytes)]
 
     // MARK: - Functional Tests
 
@@ -45,4 +46,16 @@ final class UUIDTests: XCTestCase {
 
         XCTAssert((UUID(rawValue: "BadInput") == nil), "UUID should not be created")
     }
+    
+    func testBytes() {
+        
+        let expectedData = Data(byteValue: [91, 254, 177, 148, 104, 196, 72, 232, 143, 67, 60, 88, 99, 100, 203, 111])
+        
+        let stringValue = "5BFEB194-68C4-48E8-8F43-3C586364CB6F"
+        
+        guard let uuid = UUID(rawValue: stringValue)
+            else { XCTFail("Could not create UUID from " + stringValue); return }
+        
+        XCTAssert(uuid.toData() == expectedData, "Unexpected UUID data \(uuid.toData().byteValue)")
+    }
 }

Xcode/SwiftFoundation/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1.5</string>
+	<string>1.1.7</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>