ObjectProtection 與 NumberArrayProtection 增加空字串的判斷

.github/workflows/main.yml

@@ -7,8 +7,8 @@ on:
 
 jobs:
   build:
-
     runs-on: macos-latest
+
     steps:
       - uses: actions/checkout@v4
       - name: Select Xcode

JsonDecodeProtectionTests/NumberArrayProtectionTest.swift

@@ -67,4 +67,26 @@ final class NumberArrayProtectionTest: XCTestCase
 
         XCTAssertEqual(actual, expect)
     }
+
+    func testNumberObjectProtectionWithEmptyString() throws
+    {
+        // Arrange
+        self.jsonString = """
+        {
+            "subObjects": "[{\\"name\\": \\"Jo\\", \\"number\\": 233}, {\\"name\\": \\"Ana\\", \\"number\\": 4565}]",
+            "dices": ""
+        }
+        """
+        let jsonData: Data = self.jsonString.data(using: .utf8)!
+        let jsonDecoder = JSONDecoder()
+
+        // Act
+        let object = try jsonDecoder.decode(SomeObject.self, from: jsonData)
+
+        // Assert
+        let actual: Array<Int>? = object.dices
+        let expect: Array<Int>? = nil
+
+        XCTAssertEqual(actual, expect)
+    }
 }

JsonDecodeProtectionTests/ObjectProtectionTest.swift

@@ -21,13 +21,19 @@ struct SomeObject: Decodable
 
 extension SomeObject
 {
-    struct SubObject: Decodable
+    struct SubObject: Decodable, Equatable
     {
         private(set)
         var name: String?
 
         private(set)
         var number: Int?
+
+        static
+        func == (lhs: SomeObject.SubObject, rhs: SomeObject.SubObject) -> Bool
+        {
+            lhs.name == rhs.name && lhs.number == rhs.number
+        }
     }
 }
 
@@ -90,4 +96,27 @@ final class ObjectProtectionTest: XCTestCase
 
         XCTAssertEqual(actual, expect)
     }
+
+    func testObjectProtectionWithEmptyString() throws
+    {
+        // Arrange
+        self.jsonString = """
+        {
+            "subObjects": "",
+            "dices": "[1, 5, 1]"
+        }
+        """
+
+        let jsonData: Data = self.jsonString.data(using: .utf8)!
+        let jsonDecoder = JSONDecoder()
+
+        // Act
+        let object = try jsonDecoder.decode(SomeObject.self, from: jsonData)
+
+        // Assert
+        let actual: Array<SomeObject.SubObject>? = object.subObjects
+        let expect: Array<SomeObject.SubObject>? = nil
+
+        XCTAssertEqual(actual, expect)
+    }
 }

README.md

@@ -10,7 +10,7 @@
 
 * File > Swift Packages > Add Package Dependency
 * Add https://github.com/Darktt/JsonProtection
-* Select "Up to Next Major" with "1.2.0"
+* Select "Up to Next Major" with "1.2.1"
 
 ## 功能說明
 

SourceCode/JsonProtection/NumberArrayProtection.swift

@@ -26,6 +26,27 @@ struct NumberArrayProtection<Element> where Element: Decodable, Element: NumberT
     init() { }
 }
 
+// MARK: - Private Methods -
+
+private
+extension NumberArrayProtection
+{
+    private
+    func decode(with string: String) throws -> Array<Element>?
+    {
+        guard !string.isEmpty,
+                let data: Data = string.data(using: .utf8) else {
+
+            return nil
+        }
+
+        let jsonDecoder = JSONDecoder()
+        let wrapperValue = try jsonDecoder.decode(NumbersProtection<Element>.self, from: data)
+
+        return wrapperValue.wrappedValue
+    }
+}
+
 // MARK: - Conform Protocols -
 
 extension NumberArrayProtection: Decodable
@@ -46,20 +67,6 @@ extension NumberArrayProtection: Decodable
 
         self.wrappedValue = wrappedValue
     }
-
-    private
-    func decode(with string: String) throws -> Array<Element>?
-    {
-        guard let data: Data = string.data(using: .utf8) else {
-
-            return nil
-        }
-
-        let jsonDecoder = JSONDecoder()
-        let wrapperValue = try jsonDecoder.decode(NumbersProtection<Element>.self, from: data)
-
-        return wrapperValue.wrappedValue
-    }
 }
 
 extension NumberArrayProtection: CustomStringConvertible

SourceCode/JsonProtection/ObjectProtection.swift

@@ -88,7 +88,8 @@ extension ObjectProtection
 {
     func decode(with string: String) throws -> Value?
     {
-        guard let data: Data = string.data(using: .utf8) else {
+        guard !string.isEmpty,
+              let data: Data = string.data(using: .utf8) else {
 
             return nil
         }