Version 0.2.1

Merge pull request #4 from Djcharles26/work

CHANGELOG.md

@@ -17,4 +17,8 @@
 ## 0.2.0
 - Added json list field method for handling lists
 - Added json class field method for handling custom classes
-- Updated tests with new methods
+- Updated tests with new methods
+
+## 0.2.1
+- Updated how null on exception class is executed
+- Added tests for null classes and assertion errors

CHANGELOG_LATEST.md

@@ -1,3 +1,2 @@
-- Added json list field method for handling lists
-- Added json class field method for handling custom classes
-- Updated tests with new methods
+- Updated how null on exception class is executed
+- Added tests for null classes and assertion errors

lib/body_utils.dart

@@ -112,25 +112,33 @@ dynamic jsonClassField<T> (
 
   T? retval;
 
-  dynamic body = jsonField<dynamic> (json, field,  nullable: nullable);
+  try {
+
+    dynamic body = jsonField<dynamic> (json, field,  nullable: nullable);
+
+    if (body != null) {
+      try {
+        retval = fromJson (body);
+      } on BodyException {
+        rethrow;
+      } on NoSuchMethodError catch (_) {
+        throw BodyException(
+          type: BodyExceptionType.isNull, 
+          fieldName: field.join ("_"), 
+          failedType: T, 
+          currentType: retval.runtimeType
+        );  
+      } catch (error) {
+        throw BodyException(
+          type: BodyExceptionType.undefined, 
+          fieldName: field.join ("_"),
+        );
+      }
+    }
 
-  if (body != null) {
-    try {
-      retval = fromJson (body);
-    } on BodyException {
+  } on BodyException {
+    if (!nullOnException) {
       rethrow;
-    } on NoSuchMethodError catch (_) {
-      throw BodyException(
-        type: BodyExceptionType.isNull, 
-        fieldName: field.join ("_"), 
-        failedType: T, 
-        currentType: retval.runtimeType
-      );  
-    } catch (error) {
-      throw BodyException(
-        type: BodyExceptionType.undefined, 
-        fieldName: field.join ("_"),
-      );
     }
   }
 

pubspec.yaml

@@ -1,6 +1,6 @@
 name: http_request_utils
 description: Http requests utils
-version: 0.2.0
+version: 0.2.1
 homepage: https://github.com/Djcharles26/
 repository: https://github.com/Djcharles26/http_utils.git
 

test/body_utils_test.dart

@@ -47,6 +47,14 @@ void main() {
       "\$oid": "123"
     },
     "stringList": ["Hello", "World"],
+    "badClass": {
+      "_id": {
+        "\$oid": "456"
+      },
+      "integer": 4,
+      "name": null,
+      "lastname": "Marin"
+    },
     "organization": null,
     "integer": 15,
     "number": 0.45,
@@ -92,11 +100,13 @@ void main() {
 
   test ('Check for class json fields', () {
     expect (jsonClassField<TestClass>(json, [], TestClass.fromJson, nullable: false), isA<TestClass> ());
+    expect (jsonClassField<TestClass>(json, ["badClass"], TestClass.fromJson, nullOnException: true, nullable: true), null);
     expect (jsonClassField<TestClass>(json, ["object"], (item) => TestClass.fromJson (item)), null);
   });
 
   test ('Check for class json fields with incorrect field type', () {
     expect (() => jsonClassField<TestListClass> (json, [], TestListClass.fromJson, nullable: false), throwsA(isA<BodyException> ()));
+    expect (() => jsonClassField<TestClass> (json, [], TestClass.fromJson, nullOnException: true, nullable: false), throwsA (isA<AssertionError> ()));
   });
 
   test ("Check for exceptions with incorrect file types", () {

version.txt

@@ -1 +1 @@
-0.2.0
+0.2.1