made Link.ToString a valid string

NancyHal · Apr 25, 2016 · e6759aa · e6759aa
1 parent 1f4e735
commit e6759aa
Show file tree

Hide file tree

Showing 3 changed files with 103 additions and 91 deletions.
diff --git a/src/Nancy.Hal.Example/Program.cs b/src/Nancy.Hal.Example/Program.cs
@@ -15,6 +15,7 @@ static void Main()
             using (var host = new NancyHost(new Uri("http://localhost:1234")))
             {
                 host.Start();
+                Console.WriteLine("Server running on http://localhost:1234");
                 Console.ReadLine();
             }
         }

diff --git a/src/Nancy.Hal/Link.cs b/src/Nancy.Hal/Link.cs
@@ -2,36 +2,37 @@
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
 
-using Nancy.Hal.Configuration;
-
-namespace Nancy.Hal
-{
-    public class Link : IEquatable<Link>
-    {
-        private static readonly Regex IsTemplatedRegex = new Regex(@"{.+}", RegexOptions.Compiled);
-
-        public Link()
-        {}
-
-        public Link(string rel, string href, string title = null)
+using Nancy.Hal.Configuration;
+
+namespace Nancy.Hal
+{
+    public class Link : IEquatable<Link>
+    {
+        private static readonly Regex IsTemplatedRegex = new Regex(@"{.+}", RegexOptions.Compiled);
+
+        public Link()
         {
-            Rel = rel;
-            Href = href;
-            Title = title;
         }
-
-        public string Rel { get; private set; }
-
-        public string Href { get; private set; }
-
-        public string Title { get; private set; }
-
-        public bool IsTemplated
-        {
-            get
-            {
-                return !string.IsNullOrEmpty(Href) && IsTemplatedRegex.IsMatch(Href);
-            }
+
+        public Link(string rel, string href, string title = null)
+        {
+            Rel = rel;
+            Href = href;
+            Title = title;
+        }
+
+        public string Rel { get; private set; }
+
+        public string Href { get; private set; }
+
+        public string Title { get; private set; }
+
+        public bool IsTemplated
+        {
+            get
+            {
+                return !string.IsNullOrEmpty(Href) && IsTemplatedRegex.IsMatch(Href);
+            }
         }
 
         /// <summary>
@@ -84,66 +85,74 @@ private Uri CreateUri(params object[] parameters)
             return new Uri(SubstituteParams(Href, parameters), UriKind.RelativeOrAbsolute);
         }
 
-        private static string SubstituteParams(string href, params object[] parameters)
-        {
-            var uriTemplate = new UriTemplate(href);
-            foreach (var parameter in parameters)
-            {
-                var dictionary = parameter as IDictionary<string, object>; //should work for ExpandoObject, DynamicDictionary, etc
-                if (dictionary != null)
-                {
-                    foreach (var substitution in dictionary.Keys)
-                    {
-                        var name = substitution.ToCamelCaseString();
-                        var value = dictionary[substitution];
-                        var substituionValue = value == null ? null : value.ToString();
-                        uriTemplate.SetParameter(name, substituionValue);
-                    }
-                }
-                else
-                {
-                    foreach (var substitution in parameter.GetType().GetProperties())
-                    {
-                        var name = substitution.Name.ToCamelCaseString();
-                        var value = substitution.GetValue(parameter, null);
-                        var substituionValue = value == null ? null : value.ToString();
-                        uriTemplate.SetParameter(name, substituionValue);
-                    }
-                }
-            }
-
-            return uriTemplate.Resolve();
-        }
-
-        public bool Equals(Link other)
-        {
-            return string.Compare(Href, other.Href, StringComparison.OrdinalIgnoreCase) == 0 &&
-                  string.Compare(Rel, other.Rel, StringComparison.OrdinalIgnoreCase) == 0;
-        }
-
-        public override bool Equals(object obj)
-        {
-            if (ReferenceEquals(null, obj)) return false;
-            if (ReferenceEquals(this, obj)) return true;
-            if (obj.GetType() != GetType()) return false;
-            return Equals((Link)obj);
-        }
-
-        public override int GetHashCode()
-        {
-            var str = (string.IsNullOrEmpty(Rel) ? "norel" : Rel) + "~" + (string.IsNullOrEmpty(Href) ? "nohref" : Href);
-            var h = str.GetHashCode();
-            return h;
-        }
-
-        public static bool operator ==(Link left, Link right)
-        {
-            return Equals(left, right);
-        }
-
-        public static bool operator !=(Link left, Link right)
+        private static string SubstituteParams(string href, params object[] parameters)
+        {
+            var uriTemplate = new UriTemplate(href);
+            foreach (var parameter in parameters)
+            {
+                var dictionary = parameter as IDictionary<string, object>; //should work for ExpandoObject, DynamicDictionary, etc
+                if (dictionary != null)
+                {
+                    foreach (var substitution in dictionary.Keys)
+                    {
+                        var name = substitution.ToCamelCaseString();
+                        var value = dictionary[substitution];
+                        var substituionValue = value == null ? null : value.ToString();
+                        uriTemplate.SetParameter(name, substituionValue);
+                    }
+                }
+                else
+                {
+                    foreach (var substitution in parameter.GetType().GetProperties())
+                    {
+                        var name = substitution.Name.ToCamelCaseString();
+                        var value = substitution.GetValue(parameter, null);
+                        var substituionValue = value == null ? null : value.ToString();
+                        uriTemplate.SetParameter(name, substituionValue);
+                    }
+                }
+            }
+
+            return uriTemplate.Resolve();
+        }
+
+        public bool Equals(Link other)
+        {
+            return string.Compare(Href, other.Href, StringComparison.OrdinalIgnoreCase) == 0 &&
+            string.Compare(Rel, other.Rel, StringComparison.OrdinalIgnoreCase) == 0;
+        }
+
+        public override bool Equals(object obj)
+        {
+            if (ReferenceEquals(null, obj))
+                return false;
+            if (ReferenceEquals(this, obj))
+                return true;
+            if (obj.GetType() != GetType())
+                return false;
+            return Equals((Link)obj);
+        }
+
+        public override int GetHashCode()
+        {
+            var str = (string.IsNullOrEmpty(Rel) ? "norel" : Rel) + "~" + (string.IsNullOrEmpty(Href) ? "nohref" : Href);
+            var h = str.GetHashCode();
+            return h;
+        }
+
+        public static bool operator ==(Link left, Link right)
+        {
+            return Equals(left, right);
+        }
+
+        public static bool operator !=(Link left, Link right)
+        {
+            return !Equals(left, right);
+        }
+
+        public override string ToString()
         {
-            return !Equals(left, right);
+            return string.Format("Rel={0}, Href={1}", Rel, Href);
         }
     }
-}
+}
diff --git a/src/Nancy.Hal/Processors/HalJsonResponseProcessor.cs b/src/Nancy.Hal/Processors/HalJsonResponseProcessor.cs
@@ -94,11 +94,13 @@ private static dynamic BuildDynamicLink(Link link)
         {
             dynamic dynamicLink = new ExpandoObject();
             dynamicLink.href = link.Href;
-            if (link.IsTemplated) dynamicLink.templated = true;
-            if (!string.IsNullOrEmpty(link.Title)) dynamicLink.title = link.Title;
+            if (link.IsTemplated)
+                dynamicLink.templated = true;
+            if (!string.IsNullOrEmpty(link.Title))
+                dynamicLink.title = link.Title;
             return dynamicLink;
         }
 
         public IEnumerable<Tuple<string, MediaRange>> ExtensionMappings { get { return Enumerable.Empty <Tuple<string, MediaRange>>(); } }
     }
-}
+}