Merge branch '#28'

Author: odelvalle

Slapper.AutoMapper.Tests/MapDynamicTests.cs

@@ -22,6 +22,25 @@ public class Order
             public decimal OrderTotal;
         }
 
+        public class CustomerSingleOrder
+        {
+            public int Id;
+            public string FirstName;
+            public string LastName;
+            public SingleOrder Order;
+        }
+
+        public class SingleOrder
+        {
+            public int Id;
+            public OrderDetails Details;
+        }
+
+        public class OrderDetails
+        {
+            public string Address;
+        }
+
         [Test]
         public void Can_Handle_Mapping_A_Single_Dynamic_Object()
         {
@@ -66,5 +85,47 @@ public void Can_Handle_Mapping_Nested_Members_Using_Dynamic()
             Assert.That( customers.Count() == 5 );
             Assert.That( customers.First().Orders.Count == 1 );
         }
+
+        [Test]
+        public void Nested_Member_Should_Be_Null_If_All_Values_Are_Null()
+        {
+            // Arrange
+            dynamic customer = new ExpandoObject();
+            customer.Id = 1;
+            customer.FirstName = "FirstName";
+            customer.LastName = "LastName";
+            customer.Order_Id = null;
+            customer.Order_OrderTotal = null;
+
+            // Act
+            var test = Slapper.AutoMapper.MapDynamic<CustomerSingleOrder>(customer);
+
+            // Assert
+            Assert.That(test != null);
+            Assert.That(test.Order == null);
+        }
+
+        [Test]
+        public void Nested_Member_Should_Be_Null_Only_If_All_Nested_Values_Are_Null()
+        {
+            // Arrange
+            dynamic customer = new ExpandoObject();
+            customer.Id = 1;
+            customer.FirstName = "FirstName";
+            customer.LastName = "LastName";
+            customer.Order_Id = null;
+            customer.Order_OrderTotal = null;
+            customer.Order_Details_Address = "123 Fake Ave.";
+
+            // Act
+            var test = Slapper.AutoMapper.MapDynamic<CustomerSingleOrder>(customer);
+
+            // Assert
+            Assert.That(test != null);
+            Assert.That(test.Order != null);
+            Assert.That(test.Order.Details != null);
+            Assert.That(!string.IsNullOrWhiteSpace(test.Order.Details.Address));
+            Assert.That(test.Order.Details.Address == "123 Fake Ave.");
+        }
     }
 }

Slapper.AutoMapper/Slapper.AutoMapper.InternalHelpers.cs

@@ -490,7 +490,14 @@ internal static object Map(IDictionary<string, object> dictionary, object instan
                             }
                             else
                             {
-                                nestedInstance = Map(newDictionary, nestedInstance, instance);
+                                if (newDictionary.Values.All(v => v == null))
+                                {
+                                    nestedInstance = null;
+                                }
+                                else
+                                {
+                                    nestedInstance = Map(newDictionary, nestedInstance, instance);
+                                }
                             }
 
                             SetMemberValue(member, instance, nestedInstance);