Merge pull request #5 from SomeRandomiOSDev/1.0.3

Changed visibility of CBOREncoded

Author: SomeRandomiOSDev

.gitignore

@@ -1,3 +1,4 @@
 CBORCoding.xcodeproj/project.xcworkspace
 CBORCoding.xcodeproj/xcuserdata
 .build
+.swiftpm

CBORCoding/CBOR+Codable.swift

@@ -334,8 +334,13 @@ extension CBOR.IndefiniteLengthString: Codable {
 
 extension CBOR.CBOREncoded: Encodable {
 
-    func encode(to encoder: Encoder) throws {
-        var container = encoder.singleValueContainer()
-        try container.encode(self)
+    public func encode(to encoder: Encoder) throws {
+        if let encoder = encoder as? __CBOREncoder {
+            var container = encoder.singleValueContainer()
+            try container.encode(self)
+        } else {
+            var container = encoder.singleValueContainer()
+            try container.encode(encodedData)
+        }
     }
 }

CBORCoding/CBOR.swift

@@ -193,6 +193,15 @@ public struct CBOR {
             self.chunks = chunks
         }
     }
+
+    /// A type that asserts its data is already in CBOR encoded format. No additional
+    /// encoding is done on the contained byte data
+    public struct CBOREncoded {
+
+        // MARK: - Fields
+
+        let encodedData: Data
+    }
 }
 
 // MARK: - CBOR Extension
@@ -397,15 +406,6 @@ extension CBOR {
         // swiftlint:enable force_unwrapping
     }
 
-    /// A type that asserts its data is already in CBOR encoded format. No additional
-    /// encoding is done on the contained byte data
-    internal struct CBOREncoded {
-
-        // MARK: - Fields
-
-        let encodedData: Data
-    }
-
     // MARK: Internal Methods
 
     internal static func majorType(for byte: UInt8) -> MajorType {

CBORCodingTests/CBORTests.swift

@@ -490,6 +490,16 @@ class CBORTests: XCTestCase {
         XCTAssertEqual(data, encodedData)
     }
 
+    func testEncodeCBOREncodedWithOtherEncoder() {
+        let encoder = JSONEncoder()
+        let dataToEncode = Data("CBOR".utf8)
+        var encoded1 = Data(), encoded2 = Data()
+
+        XCTAssertNoThrow(encoded1 = try encoder.encode([dataToEncode]))
+        XCTAssertNoThrow(encoded2 = try encoder.encode([CBOR.CBOREncoded(encodedData: dataToEncode)]))
+        XCTAssertEqual(encoded1, encoded2)
+    }
+
     func testDirectlyEncodeCBOREncoded() {
         struct Test: Encodable {