Add UTC DateTime Token Transformer

flipbit · May 4, 2019 · 71fc9e4 · 71fc9e4
1 parent 8f30147
commit 71fc9e4
Show file tree

Hide file tree

Showing 6 changed files with 64 additions and 9 deletions.
diff --git a/Tokenizer.Tests/Transformers/ToDateTimeTransformerTest.cs b/Tokenizer.Tests/Transformers/ToDateTimeTransformerTest.cs
@@ -17,9 +17,10 @@ public void SetUp()
         [Test]
         public void TestParseDate()
         {
-            var result = @operator.Transform("2014-01-01", "yyyy-MM-dd");
+            var result =  (DateTime) @operator.Transform("2014-01-01", "yyyy-MM-dd");
 
             Assert.AreEqual(new DateTime(2014, 1, 1), result);
+            Assert.AreEqual(DateTimeKind.Unspecified, result.Kind);
         }
 
         [Test]

diff --git a/Tokenizer.Tests/Transformers/ToDateTimeUtcTransformerTest.cs b/Tokenizer.Tests/Transformers/ToDateTimeUtcTransformerTest.cs
@@ -0,0 +1,26 @@
+using System;
+using NUnit.Framework;
+
+namespace Tokens.Transformers
+{
+    [TestFixture]
+    public class ToDateTimeUtcTransformerTest
+    {
+        private ToDateTimeUtcTransformer @operator;
+
+        [SetUp]
+        public void SetUp()
+        {
+            @operator = new ToDateTimeUtcTransformer();
+        }
+
+        [Test]
+        public void TestParseDateSetsKindToUtc()
+        {
+            var result = (DateTime) @operator.Transform("2014-01-01", "yyyy-MM-dd");
+
+            Assert.AreEqual(new DateTime(2014, 1, 1), result);
+            Assert.AreEqual(DateTimeKind.Utc, result.Kind);
+        }
+    }
+}
diff --git a/Tokenizer/Parsers/TokenParser.cs b/Tokenizer/Parsers/TokenParser.cs
@@ -32,6 +32,7 @@ public TokenParser(TokenizerOptions options)
 
             // Add default transformers/validators
             RegisterTransformer<ToDateTimeTransformer>();
+            RegisterTransformer<ToDateTimeUtcTransformer>();
             RegisterTransformer<ToLowerTransformer>();
             RegisterTransformer<ToUpperTransformer>();
             RegisterTransformer<TrimTransformer>();

diff --git a/Tokenizer/Tokenizer.csproj b/Tokenizer/Tokenizer.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
    <TargetFrameworks>netstandard2.0;net452</TargetFrameworks>
    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-   <Version>2.0.5.0</Version>
+   <Version>2.0.6.0</Version>
    <Authors>Chris Wood</Authors>
    <Company>flipbit.co.uk</Company>
    <PackageProjectUrl>http://github.com/flipbit/tokenizer</PackageProjectUrl>

diff --git a/Tokenizer/Transformers/ToDateTimeTransformer.cs b/Tokenizer/Transformers/ToDateTimeTransformer.cs
@@ -12,28 +12,33 @@ public object Transform(object value, params string[] args)
         {
             if (value == null) return string.Empty;
 
-            DateTime result;
+            return ToDateTime(value, args, out var result) ? result : value;
+        }
 
-            if (args.Length == 0 || string.IsNullOrEmpty(args[0]))
+        public static bool ToDateTime(object value, string[] formats, out DateTime result)
+        {
+            if (formats == null || formats.Length == 0 || string.IsNullOrEmpty(formats[0]))
             {
                 if (DateTime.TryParse(value.ToString(), out result))
                 {
-                    return result;
+                    return true;
                 }
             }
             else
             {
 
-                foreach (var arg in args)
+                foreach (var format in formats)
                 {
-                    if (DateTime.TryParseExact(value.ToString(), arg, CultureInfo.InvariantCulture, DateTimeStyles.None, out result))
+                    if (DateTime.TryParseExact(value.ToString(), format, CultureInfo.InvariantCulture, DateTimeStyles.None, out result))
                     {
-                        return result;
+                        return true;
                     }
                 }
             }
 
-            return value;
+            result = default(DateTime);
+
+            return false;
         }
     }
 }
diff --git a/Tokenizer/Transformers/ToDateTimeUtcTransformer.cs b/Tokenizer/Transformers/ToDateTimeUtcTransformer.cs
@@ -0,0 +1,22 @@
+using System;
+
+namespace Tokens.Transformers
+{
+    /// <summary>
+    /// Converts the token value to a <see cref="DateTime"/> in UTC format
+    /// </summary>
+    public class ToDateTimeUtcTransformer : ITokenTransformer
+    {
+        public object Transform(object value, params string[] args)
+        {
+            if (value == null) return string.Empty;
+
+            if (ToDateTimeTransformer.ToDateTime(value, args, out var result))
+            {
+                value = DateTime.SpecifyKind(result, DateTimeKind.Utc);
+            }
+
+            return value;
+        }
+    }
+}