Merge pull request #118 from leekelleher/hotfix-0.8.3

Custom PublishedContent property nullifies value

src/Our.Umbraco.Ditto/ComponentModel/ValueResolvers/UmbracoPropertyValueResolver.cs

@@ -59,9 +59,16 @@ public override object ResolveValue()
             if (!umbracoPropertyName.IsNullOrWhiteSpace())
             {
                 var contentProperty = contentType.GetProperty(umbracoPropertyName, BindingFlags.Public | BindingFlags.IgnoreCase | BindingFlags.Instance | BindingFlags.Static);
-                propertyValue = contentProperty != null
-                    ? contentProperty.GetValue(content, null)
-                    : content.GetPropertyValue(umbracoPropertyName, recursive);
+
+                if (contentProperty != null)
+                {
+                    propertyValue = contentProperty.GetValue(content, null);
+                }
+
+                if (propertyValue == null)
+                {
+                    propertyValue = content.GetPropertyValue(umbracoPropertyName, recursive);
+                }
             }
 
             // Try fetching the alt value.

tests/Our.Umbraco.Ditto.Tests/CustomPublishedContentPropertyTests.cs

@@ -0,0 +1,40 @@
+namespace Our.Umbraco.Ditto.Tests
+{
+    using Mocks;
+    using NUnit.Framework;
+
+    [TestFixture]
+    public class CustomPublishedContentPropertyTests
+    {
+        public class CustomPublishedContentMock : PublishedContentMock
+        {
+            public string MyProperty { get; set; }
+        }
+
+        public class MyModel
+        {
+            public string MyProperty { get; set; }
+        }
+
+        [Test]
+        public void CustomPublishedContent_Property_IsMapped()
+        {
+            var value = "myValue";
+
+            var property = new PublishedContentPropertyMock
+            {
+                Alias = "myProperty",
+                Value = value
+            };
+
+            var content = new CustomPublishedContentMock
+            {
+                Properties = new[] { property }
+            };
+
+            var model = content.As<MyModel>();
+
+            Assert.That(model.MyProperty, Is.EqualTo(value));
+        }
+    }
+}

tests/Our.Umbraco.Ditto.Tests/Our.Umbraco.Ditto.Tests.csproj

@@ -215,6 +215,7 @@
     <Compile Include="BasicMappingTests.cs" />
     <Compile Include="CastableInterfaceTests.cs" />
     <Compile Include="ClassLevelTypeConverterTests.cs" />
+    <Compile Include="CustomPublishedContentPropertyTests.cs" />
     <Compile Include="CustomTypeConverterTests.cs" />
     <Compile Include="ConversionHandlerTests.cs" />
     <Compile Include="CustomValueResolverTests.cs" />