#3 - Add Count, Keys, and ContainsKey to IReadableStringCollection

Author: Tratcher

src/Microsoft.AspNet.Http/IReadableStringCollection.cs

@@ -19,7 +19,22 @@ public interface IReadableStringCollection : IEnumerable<KeyValuePair<string, st
         /// <returns></returns>
         string this[string key] { get; }
 
-        // Joined
+        /// <summary>
+        /// Gets the number of elements contained in the collection.
+        /// </summary>
+        int Count { get; }
+
+        /// <summary>
+        /// Gets a collection containing the keys.
+        /// </summary>
+        ICollection<string> Keys { get; }
+
+        /// <summary>
+        /// Determines whether the collection contains an element with the specified key.
+        /// </summary>
+        /// <param name="key"></param>
+        /// <returns></returns>
+        bool ContainsKey(string key);
 
         /// <summary>
         /// Get the associated value from the collection.  Multiple values will be merged.
@@ -30,16 +45,12 @@ public interface IReadableStringCollection : IEnumerable<KeyValuePair<string, st
         [SuppressMessage("Microsoft.Naming", "CA1716:IdentifiersShouldNotMatchKeywords", MessageId = "Get", Justification = "Re-evaluate later.")]
         string Get(string key);
 
-        // Joined
-
         /// <summary>
         /// Get the associated values from the collection in their original format.
         /// Returns null if the key is not present.
         /// </summary>
         /// <param name="key"></param>
         /// <returns></returns>
         IList<string> GetValues(string key);
-
-        // Raw
     }
 }

src/Microsoft.AspNet.PipelineCore/Collections/ReadableStringCollection.cs

@@ -31,6 +31,23 @@ public ReadableStringCollection(IDictionary<string, string[]> store)
 
         private IDictionary<string, string[]> Store { get; set; }
 
+        /// <summary>
+        /// Gets the number of elements contained in the collection.
+        /// </summary>
+        public int Count
+        {
+            get { return Store.Count; }
+        }
+
+        /// <summary>
+        /// Gets a collection containing the keys.
+        /// </summary>
+        public ICollection<string> Keys
+        {
+            get { return Store.Keys; }
+        }
+
+
         /// <summary>
         /// Get the associated value from the collection.  Multiple values will be merged.
         /// Returns null if the key is not present.
@@ -42,6 +59,16 @@ public string this[string key]
             get { return Get(key); }
         }
 
+        /// <summary>
+        /// Determines whether the collection contains an element with the specified key.
+        /// </summary>
+        /// <param name="key"></param>
+        /// <returns></returns>
+        public bool ContainsKey(string key)
+        {
+            return Store.ContainsKey(key);
+        }
+
         /// <summary>
         /// Get the associated value from the collection.  Multiple values will be merged.
         /// Returns null if the key is not present.

src/Microsoft.AspNet.PipelineCore/Collections/RequestCookiesCollection.cs

@@ -18,30 +18,55 @@ public RequestCookiesCollection()
             _dictionary = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
         }
 
-        public IEnumerator<KeyValuePair<string, string[]>> GetEnumerator()
+        public string this[string key]
         {
-            foreach (var pair in _dictionary)
-            {
-                yield return new KeyValuePair<string, string[]>(pair.Key, new[] { pair.Value });
-            }
+            get { return Get(key); }
         }
 
-        IEnumerator IEnumerable.GetEnumerator()
+        /// <summary>
+        /// Gets the number of elements contained in the collection.
+        /// </summary>
+        public int Count
         {
-            return GetEnumerator();
+            get { return _dictionary.Count; }
         }
 
-        public string this[string key]
+        /// <summary>
+        /// Gets a collection containing the keys.
+        /// </summary>
+        public ICollection<string> Keys
         {
-            get { return Get(key); }
+            get { return _dictionary.Keys; }
+        }
+
+        /// <summary>
+        /// Determines whether the collection contains an element with the specified key.
+        /// </summary>
+        /// <param name="key"></param>
+        /// <returns></returns>
+        public bool ContainsKey(string key)
+        {
+            return _dictionary.ContainsKey(key);
         }
 
+        /// <summary>
+        /// Get the associated value from the collection.  Multiple values will be merged.
+        /// Returns null if the key is not present.
+        /// </summary>
+        /// <param name="key"></param>
+        /// <returns></returns>
         public string Get(string key)
         {
             string value;
             return _dictionary.TryGetValue(key, out value) ? value : null;
         }
 
+        /// <summary>
+        /// Get the associated values from the collection in their original format.
+        /// Returns null if the key is not present.
+        /// </summary>
+        /// <param name="key"></param>
+        /// <returns></returns>
         public IList<string> GetValues(string key)
         {
             string value;
@@ -56,6 +81,19 @@ public void Reparse(string cookiesHeader)
             ParsingHelpers.ParseDelimited(cookiesHeader, SemicolonAndComma, AddCookieCallback, _dictionary);
         }
 
+        public IEnumerator<KeyValuePair<string, string[]>> GetEnumerator()
+        {
+            foreach (var pair in _dictionary)
+            {
+                yield return new KeyValuePair<string, string[]>(pair.Key, new[] { pair.Value });
+            }
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+
         private static readonly Action<string, string, object> AddCookieCallback = (name, value, state) =>
         {
             var dictionary = (IDictionary<string, string>)state;