Introduced ability to map Uri types

Author: JeremyCaney

OnTopic.AspNetCore.Mvc.Tests/ValidateTopicAttributeTest.cs

@@ -34,7 +34,7 @@ public class ValidateTopicAttributeTest {
     /// <summary>
     ///   Given a <see cref="Controller"/>, generates a barebones <see cref="ActionExecutingContext"/> for testing.
     /// </summary>
-    public ActionExecutingContext GetActionExecutingContext(Controller controller) {
+    public static ActionExecutingContext GetActionExecutingContext(Controller controller) {
 
       var modelState            = new ModelStateDictionary();
 
@@ -62,7 +62,7 @@ public ActionExecutingContext GetActionExecutingContext(Controller controller) {
     /// <summary>
     ///   Generates a barebones <see cref="ControllerContext"/> for testing a controller.
     /// </summary>
-    public ControllerContext GetControllerContext() =>
+    public static ControllerContext GetControllerContext() =>
       new ControllerContext(
         new ActionContext() {
           HttpContext               = new DefaultHttpContext(),
@@ -77,7 +77,7 @@ public ControllerContext GetControllerContext() =>
     /// <summary>
     ///   Generates a barebones <see cref="ControllerContext"/> for testing a controller.
     /// </summary>
-    public TopicController GetTopicController(Topic topic) =>
+    public static TopicController GetTopicController(Topic topic) =>
       new TopicController(
           new DummyTopicRepository(),
           new DummyTopicMappingService()

OnTopic.Tests/TopicMappingServiceTest.cs

@@ -182,12 +182,14 @@ public async Task MapNullablePropertiesWithInvalidValues() {
       topic.Attributes.SetValue("NullableInteger", "A");
       topic.Attributes.SetValue("NullableBoolean", "43");
       topic.Attributes.SetValue("NullableDateTime", "Hello World");
+      topic.Attributes.SetValue("NullableUrl", "invalid://Web\\Path\\File!?@Query=String?");
 
       var target                = await mappingService.MapAsync<NullablePropertyTopicViewModel>(topic).ConfigureAwait(false);
 
       Assert.IsNull(target.NullableInteger);
       Assert.IsNull(target.NullableBoolean);
       Assert.IsNull(target.NullableDateTime);
+      Assert.IsNull(target.NullableUrl);
 
       //The following should not be null since they map to non-nullable properties which will have default values
       Assert.AreEqual(topic.Title, target.Title);
@@ -214,6 +216,7 @@ public async Task MapNullablePropertiesWithValidValues() {
       topic.Attributes.SetValue("NullableDouble", "3.14159265359");
       topic.Attributes.SetValue("NullableBoolean", "tRuE");
       topic.Attributes.SetValue("NullableDateTime", "10/15/1976");
+      topic.Attributes.SetValue("NullableUrl", "/Web/Path/File?Query=String");
 
       topic.Attributes.SetValue("Title", "Hello World.");
       topic.Attributes.SetValue("IsHidden", "true");
@@ -226,6 +229,7 @@ public async Task MapNullablePropertiesWithValidValues() {
       Assert.AreEqual<double?>(3.14159265359, target.NullableDouble);
       Assert.AreEqual<bool?>(true, target.NullableBoolean);
       Assert.AreEqual<DateTime?>(new DateTime(1976, 10, 15), target.NullableDateTime);
+      Assert.AreEqual<Uri?>(new Uri("/Web/Path/File?Query=String", UriKind.RelativeOrAbsolute), target.NullableUrl);
 
       Assert.AreEqual<string?>(topic.Title, target.Title);
       Assert.AreEqual<bool?>(target.IsHidden, target.IsHidden);

OnTopic.Tests/ViewModels/NullablePropertyTopicViewModel.cs

@@ -28,11 +28,14 @@ public class NullablePropertyTopicViewModel {
 
     public DateTime? NullableDateTime { get; set; }
 
-    public String? Title { get; set; }
+    public Uri? NullableUrl { get; set; }
+
+    public string? Title { get; set; }
 
     public bool? IsHidden { get; set; }
 
     public DateTime? LastModified { get; set; }
 
+
   } //Class
 } //Namespace

OnTopic.ViewModels/ContentItemTopicViewModel.cs

@@ -4,6 +4,8 @@
 | Project       Topics Library
 \=============================================================================================================================*/
 
+using System;
+
 namespace OnTopic.ViewModels {
 
   /*============================================================================================================================
@@ -33,15 +35,15 @@ public class ContentItemTopicViewModel: ItemTopicViewModel {
     /// <summary>
     ///   Gets an optional URL for additional information that should be linked to.
     /// </summary>
-    public string? LearnMoreUrl { get; set; }
+    public Uri? LearnMoreUrl { get; set; }
 
     /*==========================================================================================================================
     | THUMBNAIL IMAGE
     \-------------------------------------------------------------------------------------------------------------------------*/
     /// <summary>
     ///   Gets an optional path to a thumbnail image that should accompany the content item.
     /// </summary>
-    public string? ThumbnailImage { get; set; }
+    public Uri? ThumbnailImage { get; set; }
 
     /*==========================================================================================================================
     | CATEGORY

OnTopic.ViewModels/PageTopicViewModel.cs

@@ -48,6 +48,12 @@ public class PageTopicViewModel: TopicViewModel, IPageTopicViewModel {
     /// <inheritdoc />
     public string? MetaKeywords { get; set; }
 
+    /*==========================================================================================================================
+    | META KEYWORDS
+    \-------------------------------------------------------------------------------------------------------------------------*/
+    /// <summary>
+    ///   Determines whether or not search engines are expected to index the page.
+    /// </summary>
     public bool? NoIndex { get; set; }
 
     /*==========================================================================================================================

OnTopic.ViewModels/SectionTopicViewModel.cs

@@ -4,6 +4,8 @@
 | Project       Topics Library
 \=============================================================================================================================*/
 
+using System;
+
 namespace OnTopic.ViewModels {
 
   /*============================================================================================================================
@@ -25,7 +27,7 @@ public class SectionTopicViewModel : TopicViewModel {
     /// <summary>
     ///   Provides a header image which may be displayed at the top of a section.
     /// </summary>
-    public string? HeaderImageUrl { get; set; }
+    public Uri? HeaderImageUrl { get; set; }
 
   } //Class
 } //Namespace

OnTopic.ViewModels/TopicViewModel.cs

@@ -70,6 +70,12 @@ public class TopicViewModel: ITopicViewModel {
     /// <inheritdoc />
     public bool IsHidden { get; set; }
 
+    /*==========================================================================================================================
+    | LAST MODIFIED
+    \-------------------------------------------------------------------------------------------------------------------------*/
+    /// <summary>
+    ///   The date that the topic was last modified on.
+    /// </summary>
     public DateTime LastModified { get; set; }
 
     /*==========================================================================================================================

OnTopic.ViewModels/VideoTopicViewModel.cs

@@ -4,6 +4,8 @@
 | Project       Topics Library
 \=============================================================================================================================*/
 
+using System;
+
 namespace OnTopic.ViewModels {
 
   /*============================================================================================================================
@@ -25,15 +27,15 @@ public class VideoTopicViewModel: PageTopicViewModel {
     /// <summary>
     ///   Provides a URL reference to a video to display on the page.
     /// </summary>
-    public string? VideoUrl { get; set; }
+    public Uri? VideoUrl { get; set; }
 
     /*==========================================================================================================================
     | POSTER URL
     \-------------------------------------------------------------------------------------------------------------------------*/
     /// <summary>
     ///   Provides a URL reference to an image to display prior to playing the video.
     /// </summary>
-    public string? PosterUrl { get; set; }
+    public Uri? PosterUrl { get; set; }
 
   } //Class
 } //Namespace

OnTopic/Internal/Reflection/TypeMemberInfoCollection.cs

@@ -41,7 +41,8 @@ static TypeMemberInfoCollection() {
         typeof(double?),
         typeof(string),
         typeof(DateTime),
-        typeof(DateTime?)
+        typeof(DateTime?),
+        typeof(Uri)
       };
     }
 
@@ -434,6 +435,11 @@ private static bool IsSettableType(Type sourceType, Type? targetType = null) {
           valueObject = date;
         }
       }
+      else if (type.Equals(typeof(Uri))) {
+        if (Uri.TryCreate(value, UriKind.RelativeOrAbsolute, out var uri)) {
+          valueObject = uri;
+        }
+      }
 
       return valueObject;
 

OnTopic/Metadata/ContentTypeDescriptor.cs

@@ -20,7 +20,7 @@ namespace OnTopic.Metadata {
   ///   <para>
   ///     Each topic is associated with a content type. The content type determines which attributes are displayed in the Topics
   ///     Editor (via the <see cref="AttributeDescriptors"/> property). The content type also determines, by default, which view
-  ///     is rendered by the <see cref="Topics.ITopicRoutingService"/> (assuming the value isn't overwritten down the pipe).
+  ///     is rendered by the <see cref="ITopicRoutingService"/> (assuming the value isn't overwritten down the pipe).
   ///   </para>
   ///   <para>
   ///     Each content type associated with a <see cref="Topic"/> is itself a <see cref="Topic"/> with a Content Type of