fixed binary subtype printing

Author: colemancda

Sources/BinaryJSON/BSON.swift

@@ -82,15 +82,15 @@ public struct BSON {
 
     public struct Binary: Equatable {
 
-        public enum Subtype {
-            
-            case Generic
-            case Function
-            case Old
-            case UUID
-            case UUIDOld
-            case MD5
-            case User
+        public enum Subtype: Byte {
+            
+            case Generic    = 0x00
+            case Function   = 0x01
+            case Old        = 0x02
+            case UUIDOld    = 0x03
+            case UUID       = 0x04
+            case MD5        = 0x05
+            case User       = 0x80
         }
 
         public var data: Data

Sources/BinaryJSON/JSONEncodable.swift

@@ -125,16 +125,22 @@ extension BSON.Timestamp: JSONEncodable {
 
 extension BSON.Binary: JSONEncodable {
 
-    private static var JSONKey: String { return "$binary" }
+    private enum JSONKey: String {
+        
+        case binary = "$binary"
+        case type = "$type"
+    }
 
     public func toJSON() -> JSON.Value {
 
         let base64EncodedData = Base64.encode(self.data)
 
         guard let base64String = String(UTF8Data: base64EncodedData)
             else { fatalError("Could not create string from Base64 data") }
+                
+        let subtypeHexString = String(format:"%02hhX", subtype.rawValue)
 
-        return .Object([BSON.Binary.JSONKey: .String(base64String)])
+        return .Object([JSONKey.binary.rawValue: .String(base64String), JSONKey.type.rawValue: .String(subtypeHexString)])
     }
 }
 

Sources/UnitTests/BSONTests.swift

@@ -65,15 +65,15 @@ class BSONTests: XCTestCase {
 
         print("JSON: \n\(jsonString)\n")
 
-        let convertedJSON = document.toJSON()
-        
-        print("Converted JSON: \n\(convertedJSON)\n")
-        
         guard let parsedJSON = JSON.Value(string: jsonString)
             else { XCTFail("Could not parse JSON string"); return }
 
         print("Parsed JSON: \n\(parsedJSON)\n")
 
+        let convertedJSON = document.toJSON()
+        
+        print("Converted JSON: \n\(convertedJSON)\n")        
+        
         XCTAssert(parsedJSON == convertedJSON, "Converted JSON should equal parsed JSON")
     }
 }