Merge pull request #39 from kluhman/umbraco-file-support

Updates value transformation process

CHANGELOG.md

@@ -1,6 +1,7 @@
 ## v1.3.2
 
 * Updates UmbracoWebContext.GetCurrent to use the PublishedContent from the PublishedContentRequest rather than getting a page by the current id. 
+* Updated value transformation process to execute type handler even if value type already matches target type to ensure all proper transforms are applied.
 
 ## v1.3.1
 

UmbracoVault.Tests/Attributes/TrimStringPropertyAttribute.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+using UmbracoVault.Attributes;
+using UmbracoVault.Tests.Handlers;
+
+namespace UmbracoVault.Tests.Attributes
+{
+    public class TrimStringPropertyAttribute : UmbracoPropertyAttribute
+    {
+        public TrimStringPropertyAttribute()
+        {
+            TypeHandler = new TrimStringTypeHandler();
+        }
+
+        public TrimStringPropertyAttribute(string alias) : base(alias)
+        {
+            TypeHandler = new TrimStringTypeHandler();
+        }
+    }
+}

UmbracoVault.Tests/Handlers/TrimStringTypeHandler.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+using UmbracoVault.TypeHandlers;
+
+namespace UmbracoVault.Tests.Handlers
+{
+    class TrimStringTypeHandler : ITypeHandler
+    {
+        public object GetAsType<T>(object input)
+        {
+            return input?.ToString()?.Trim();
+        }
+
+        public Type TypeSupported => typeof(string);
+    }
+}

UmbracoVault.Tests/Models/ExampleModelAllTypes.cs

@@ -1,4 +1,5 @@
 using UmbracoVault.Attributes;
+using UmbracoVault.Tests.Attributes;
 
 namespace UmbracoVault.Tests.Models
 {
@@ -57,5 +58,8 @@ public class ExampleModelAllTypes
 
         [UmbracoEnumProperty]
         public ExampleEnum ExampleEnum { get; set; }
+
+        [TrimStringProperty]
+        public string TypeHandledString { get; set; }
     }
 }

UmbracoVault.Tests/UmbracoContextTests.cs

@@ -31,6 +31,7 @@ public void Initialize()
                 Source.StringArray = new[] {"100", "200", "300"};
                 Source.Object = new { Name = "TestObject" };
                 Source.ExampleEnum = ExampleEnum.Harry;
+                Source.TypeHandledString = "       this string needs to be trimmed        ";
 
                 var specialCases = new NameValueCollection
                 {
@@ -170,6 +171,12 @@ public void String_IsSet()
                 Assert.AreEqual(Source.String, Destination.String);
             }
 
+            [TestMethod]
+            public void TypeHandler_ShouldExecute_EvenWhenTypesAlreadyMatch()
+            {
+                Assert.AreEqual(Source.TypeHandledString.Trim(), Destination.TypeHandledString);
+            }
+
             [TestMethod]
             public void UInt_IsSet()
             {

UmbracoVault.Tests/UmbracoVault.Tests.csproj

@@ -63,7 +63,9 @@
     </Otherwise>
   </Choose>
   <ItemGroup>
+    <Compile Include="Attributes\TrimStringPropertyAttribute.cs" />
     <Compile Include="DefaultInstanceFactoryTests.cs" />
+    <Compile Include="Handlers\TrimStringTypeHandler.cs" />
     <Compile Include="ProxyInstanceInterfaceFactoryTests.cs" />
     <Compile Include="DefaultInstanceInterfaceFactoryTests.cs" />
     <Compile Include="Models\AutoRegisteredTypeHandler.cs" />

UmbracoVault/Base/BaseUmbracoContext.cs

@@ -286,19 +286,21 @@ protected object TransformParsedValue(PropertyInfo propertyInfo, UmbracoProperty
                 (current, transform) => transform.Transform(current));
             */
 
-            if (value.GetType() == propertyType)
+            var typeHandler = GetTypeHandler(propertyType, propertyMetaData);
+
+            //unsupported if the value is not target type and there is no handler
+            if (value.GetType() != propertyType && typeHandler == null)
             {
-                return value;
+                throw new NotSupportedException($"The property type {propertyType} is not supported by Umbraco Vault.");
             }
 
-            var typeHandler = GetTypeHandler(propertyType, propertyMetaData);
-
+            //if there is no handler, but value is already the target type, return value
             if (typeHandler == null)
             {
-                throw new NotSupportedException(
-                    $"The property type {propertyType} is not supported by Umbraco Vault.");
+                return value;
             }
 
+            //apply handler
             if (typeHandler is EnumTypeHandler)
             {
                 // Unfortunately, the EnumTypeHandler currently requires special attention because the GetAsType has a "where T : class" constraint.
@@ -314,16 +316,14 @@ protected object TransformParsedValue(PropertyInfo propertyInfo, UmbracoProperty
             {
                 var method = typeHandler.GetType().GetMethod("GetAsType");
                 var generic = method.MakeGenericMethod(propertyInfo.PropertyType.GetGenericArguments()[0]);
-                value = generic.Invoke(typeHandler, new[] { value });
+                return generic.Invoke(typeHandler, new[] { value });
             }
             else
             {
                 var method = typeHandler.GetType().GetMethod("GetAsType");
                 var generic = method.MakeGenericMethod(propertyInfo.PropertyType);
-                value = generic.Invoke(typeHandler, new[] { value });
+                return generic.Invoke(typeHandler, new[] { value });
             }
-
-            return value;
         }
 
         private ITypeHandler GetTypeHandler(Type propertyType, UmbracoPropertyAttribute propertyMetaData)

UmbracoVault/UmbracoVault.nuspec

@@ -13,6 +13,7 @@
         <summary>Vault for Umbraco is an easy-to-use, extensible ORM to quickly and easily get strongly-typed Umbraco CMS data into your views.</summary>
         <releaseNotes>
           * Updates UmbracoWebContext.GetCurrent to use the PublishedContent from the PublishedContentRequest rather than getting a page by the current id. 
+          * Updated value transformation process to execute type handler even if value type already matches target type to ensure all proper transforms are applied.
         </releaseNotes>
       <copyright>(c) The Nerdery LLC 2016. All Rights Reserved.</copyright>
       <tags>Umbraco UmbracoVault Mapping ObjectMapper ORM CMS</tags>