Merge pull request #2158 from github/autocompletebox-fix

Modernizing and Implementing Autocompletebox

Author: StanleyGoldman

src/GitHub.App/Caches/AutoCompleteSourceCache.cs

@@ -1,4 +1,5 @@
 using System;
+using GitHub.Extensions;
 using GitHub.Helpers;
 
 namespace GitHub.Models
@@ -9,36 +10,22 @@ namespace GitHub.Models
     /// </summary>
     public class SuggestionItem
     {
-        public SuggestionItem() // So this can be deserialized from cache
-        {
-        }
-
-        public SuggestionItem(string name, Uri iconCacheKey)
-        {
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(iconCacheKey, "iconCacheKey");
-            
-            Name = name;
-            IconKey = iconCacheKey;
-        }
-
         public SuggestionItem(string name, string description)
         {
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(description, "description");
+            Guard.ArgumentNotEmptyString(name, "name");
+            Guard.ArgumentNotEmptyString(description, "description");
 
             Name = name;
             Description = description;
         }
 
-        public SuggestionItem(string name, string description, Uri iconCacheKey)
+        public SuggestionItem(string name, string description, string imageUrl)
         {
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(iconCacheKey, "iconCacheKey");
+            Guard.ArgumentNotEmptyString(name, "name");
 
             Name = name;
             Description = description;
-            IconKey = iconCacheKey;
+            ImageUrl = imageUrl;
         }
 
         /// <summary>
@@ -52,9 +39,9 @@ public SuggestionItem(string name, string description, Uri iconCacheKey)
         public string Description { get; set; }
 
         /// <summary>
-        /// A key to lookup when displaying the icon for this entry
+        /// An image url for this entry
         /// </summary>
-        public Uri IconKey { get; set; }
+        public string ImageUrl { get; set; }
 
         /// <summary>
         /// The date this suggestion was last modified according to the API.