adding MacAddress Data Type

Author: khoogheem

Sources/DataDecoder/DataDecoder.swift

@@ -214,7 +214,7 @@ public extension DataDecoder {
     ///
     /// - Parameter fromLittleEndian: If MAC is encoded as Little Endian
     /// - Returns: String Representation of the MAC Address
-    public mutating func decodeMACAddress(fromLittleEndian: Bool = false) -> String {
+    public mutating func decodeMACAddress(fromLittleEndian: Bool = false) -> MACAddress {
         let val0 = decode.scanValue(index: &index, type: UInt8.self) ?? 0
         let val1 = decode.scanValue(index: &index, type: UInt8.self) ?? 0
         let val2 = decode.scanValue(index: &index, type: UInt8.self) ?? 0
@@ -230,7 +230,7 @@ public extension DataDecoder {
             retVal = String(format: "%02X:%02X:%02X:%02X:%02X:%02X", val0, val1, val2, val3, val4, val5)
         }
 
-        return retVal
+        return MACAddress(string: retVal)
     }
 
 }

Sources/DataDecoder/Types/MACAddress.swift

@@ -0,0 +1,73 @@
+//
+//  MACAddress.swift
+//  DataDecoder
+//
+//  Created by Kevin Hoogheem on 4/1/17.
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in
+//  all copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+//  THE SOFTWARE.
+
+import Foundation
+
+
+public struct MACAddress {
+
+    fileprivate(set) public var stringValue: String
+
+    public var dataValue: Data {
+        let substring = stringValue.replacingOccurrences(of: ":", with: "")
+        //let da = Data(bytes: [Character](substring.characters).byteArray)
+
+        return substring.data(using: .utf8)!
+    }
+
+    public init(string: String) {
+        self.stringValue = string.uppercased()
+    }
+
+    public init(data: Data) {
+
+        self.stringValue = "00:00:00:00:00:00"
+
+        if data.count == 6 {
+            self.stringValue = String(format: "%02X:%02X:%02X:%02X:%02X:%02X",
+                                      data[0],
+                                      data[1],
+                                      data[2],
+                                      data[3],
+                                      data[4],
+                                      data[5]).uppercased()
+        }
+    }
+}
+
+extension MACAddress: Equatable {
+
+    public static func ==(lhs: MACAddress, rhs: MACAddress) -> Bool {
+        return (lhs.stringValue == rhs.stringValue)
+    }
+}
+
+extension MACAddress: Hashable {
+
+    public var hashValue: Int {
+        return stringValue.hashValue
+    }
+}
+
+

Tests/DataDecoderTests/DataDecoderTests.swift

@@ -7,7 +7,7 @@ class DataDecoderTests: XCTestCase {
         // This is an example of a functional test case.
         // Use XCTAssert and related functions to verify your tests produce the correct results.
 
-        let sensorData: Data = Data([ 0x02, 0xFE, 0xFF, 0xEF, 0xBE, 0xAD, 0xDE, 0xA5])
+        let sensorData: Data = Data([0x02, 0xFE, 0xFF, 0xEF, 0xBE, 0xAD, 0xDE, 0xA5])
 
         let DEADBEEF: UInt32 = 3735928559
 
@@ -41,7 +41,7 @@ class DataDecoderTests: XCTestCase {
     }
 
     func testUInt24()  {
-        let ipData: Data = Data([ 0xFF, 0xFF, 0xFF])
+        let ipData: Data = Data([0xFF, 0xFF, 0xFF])
 
         var decoder = DataDecoder(ipData)
 
@@ -53,7 +53,7 @@ class DataDecoderTests: XCTestCase {
     }
 
     func testUInt48()  {
-        let ipData: Data = Data([ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF])
+        let ipData: Data = Data([0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF])
 
         var decoder = DataDecoder(ipData)
 
@@ -77,14 +77,14 @@ class DataDecoderTests: XCTestCase {
         }
     }
 
-    func testMACADdress() {
+    func testMACAddress() {
         let ipData: Data = Data([ 0x00, 0x50, 0xC2, 0x34, 0xF7, 0x11])
 
         var decoder = DataDecoder(ipData)
 
         let macaddress = decoder.decodeMACAddress()
 
-        if macaddress != "00:50:C2:34:F7:11" {
+        if macaddress.stringValue != "00:50:C2:34:F7:11" {
             XCTFail()
         }