Update MD

Author: CoderMJLee

CHANGELOG.md

@@ -2,13 +2,28 @@
 
 ---
 
-## [1.1.0](https://github.com/kakaopensource/KakaJSON/releases/tag/1.1.0) (2019-08-27)
+## new
+- Merged pull requests
+	- [use isUppercase to check if the character is uppercase](https://github.com/kakaopensource/KakaJSON/pull/20)
+	- [A key should be able to contain dot](https://github.com/kakaopensource/KakaJSON/pull/21)
+       - [use enum as namespace, as Apple does in Combine](https://github.com/kakaopensource/KakaJSON/pull/23)
+       - [return early if possible](https://github.com/kakaopensource/KakaJSON/pull/24)
+       - [add test testComplex_JSONKeyWithDot_bestMatch](https://github.com/kakaopensource/KakaJSON/pull/25)
+       - [[big pr]: refactor project structure](https://github.com/kakaopensource/KakaJSON/pull/27)
+       
+       
+
+## [1.1.0](https://github.com/kakaopensource/KakaJSON/releases/tag/1.1.0) (2019-08-28)
 - Remove locks in ConvertibleConfig
 - Simplify apis
 - Support carthage
+- Keep default model value for optimization
 - Merged pull requests
 	- [simplify optional.kj_value](https://github.com/kakaopensource/KakaJSON/pull/16)
 	- [replace symbol ~= with pattern keyword](https://github.com/kakaopensource/KakaJSON/pull/17)
 
+
+
 ## [1.0.0](https://github.com/kakaopensource/KakaJSON/releases/tag/1.0.0) (2019-08-23)
-- First public release
+
+- First public release

README.md

@@ -460,7 +460,7 @@ XCTAssert(person.books?[1].name == "Data Structure And Algorithm")
 XCTAssert(person.dogs?["dog0"]?.name == "Larry")
 ```
 
-### Nested Model2
+### Nested Model 2
 ```swift
 struct Book: Convertible, Hashable {
     var name: String = ""
@@ -488,7 +488,7 @@ XCTAssert(book?.name == "Fast C++")
 XCTAssert(book?.price == 666.6)
 ```
 
-### Nested Model3
+### Nested Model 3
 ```swift
 struct Car: Convertible {
     var name: String = ""

Sources/KakaJSON/Convert/Values.swift

@@ -23,8 +23,8 @@ public enum Values {
         case is NumberValue.Type: return _number(v, type)
         case is StringValue.Type: return _string(v, type)
         case let ct as Convertible.Type: return _model(v, ct, defaultValue)
-        case is DateValue.Type: return _date(v)
         case is ArrayValue.Type: return _array(v, type)
+        case is DateValue.Type: return _date(v)
         case is DictionaryValue.Type: return _dictionary(v, type)
         case is URLValue.Type: return _url(v)
         case is DataValue.Type: return _data(v, type)
@@ -43,8 +43,8 @@ public enum Values {
         switch v {
         case let num as NumberValue: return _JSONValue(from: num)
         case let model as Convertible: return model.kj_JSONObject()
-        case let date as Date: return date.timeIntervalSince1970
         case let array as [Any]: return _JSONValue(from: array)
+        case let date as Date: return date.timeIntervalSince1970
         case let dict as [String: Any]: return _JSONValue(from: dict)
         case let url as URL: return url.absoluteString
         case let set as SetValue: return _JSONValue(from: set)
@@ -170,22 +170,22 @@ private extension Values {
         guard let str = _numberString(value) else { return nil }
         guard let decimal = Decimal(string: str) else { return nil }
 
-        // decimal
-        if type is Decimal.Type { return decimal }
-        
         // digit
         if let digitType = type as? DigitValue.Type {
-            guard let double = Double("\(decimal)") else { return nil }
-            let number = NSNumber(value: double)
-            return digitType.init(truncating: number)
+            return Double("\(decimal)")
+                .flatMap { NSNumber(value: $0) }
+                .flatMap { digitType.init(truncating: $0) }
         }
 
         // decimal number
         if type is NSDecimalNumber.Type {
             return NSDecimalNumber(decimal: decimal)
         }
 
-        // number
+        // decimal
+        if type is Decimal.Type { return decimal }
+        
+        // other
         return Double("\(decimal)").flatMap { NSNumber(value: $0) }
     }
 
@@ -411,4 +411,3 @@ postfix func ~! (_ value: Any) -> Any? {
 postfix func ~! (_ value: Any?) -> Any? {
     return (value as OptionalValue).kj_value
 }
-

Tests/KakaJSONTests/JSON_To_Model/JTM_06_CustomValue.swift

@@ -138,6 +138,45 @@ class JTM_06_CustomValue: XCTestCase {
         XCTAssert(book1?.price == Double(books[1].price))
     }
 
+    // MARK: - NestedArray
+    func testNestedArray() {
+        struct Dog: Convertible {
+            var name: String = ""
+            var weight: Double = 0.0
+        }
+        
+        struct Person: Convertible {
+            var name: String = ""
+            var pet: [[Dog]]?
+            func kj_modelValue(from jsonValue: Any?,
+                               _ property: Property) -> Any? {
+                if property.name != "pet" { return jsonValue }
+                return (jsonValue as? [[[String: Any]]])?.map {
+                    $0.kj.modelArray(Dog.self)
+                }
+            }
+        }
+        
+        let name = "Jack"
+        let dog = (name: "Wang", weight: 109.5)
+        
+        let json: [String: Any] = [
+            "name": name,
+            "pet": [
+                [["name": dog.name, "weight": dog.weight]],
+                [["name": dog.name, "weight": dog.weight]]
+            ]
+        ]
+        
+        let person = json.kj.model(Person.self)
+        XCTAssert(person.name == name)
+        
+        XCTAssert(person.pet?[0][0].name == dog.name)
+        XCTAssert(person.pet?[0][0].weight == dog.weight)
+        XCTAssert(person.pet?[1][0].name == dog.name)
+        XCTAssert(person.pet?[1][0].weight == dog.weight)
+    }
+    
     // MARK: - Other
     func testOther1() {
         struct Student: Convertible {
@@ -189,6 +228,7 @@ class JTM_06_CustomValue: XCTestCase {
         "testDate": testDate,
         "testAny": testAny,
         "testAnyArray": testAnyArray,
+        "testNestedArray": testNestedArray,
         "testOther1": testOther1,
         "testOther2": testOther2
     ]