Merge pull request #41 from shiftkey/testing-uri-parsing

Bugfix - Uris are being deserialized like strings
facebook-csharp-sdk · Nov 4, 2013 · 77ec61f · 77ec61f
2 parents 59ebd6b + 10425d4
commit 77ec61f
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 0 deletions.
diff --git a/src/SimpleJson.Tests/DeserializeObjectTests.cs b/src/SimpleJson.Tests/DeserializeObjectTests.cs
@@ -496,6 +496,26 @@ public void DeserializeDoubleQuotesCorrectly()
             Assert.AreEqual("Hi \"Prabir\"", result["message"]);
         }
 
+        class ClassWithUri { public Uri url { get; set; } }
+
+        [TestMethod]
+        public void DeserializeUriCorrectly()
+        {
+            var json = "{\"url\":\"https://github.com/shiftkey/simple-json/issues/1\"}";
+            var result = SimpleJson.DeserializeObject<ClassWithUri>(json);
+
+            Assert.AreEqual(new Uri("https://github.com/shiftkey/simple-json/issues/1"), result.url);
+        }
+
+        [TestMethod]
+        public void DeserializeInvalidUriCorrectly()
+        {
+            var json = "{\"url\":\"this is a broken uri\"}";
+            var result = SimpleJson.DeserializeObject<ClassWithUri>(json);
+
+            Assert.IsNull(result.url);
+        }
+
         [TestMethod]
         public void DeserializeUnknownProperty()
         {

diff --git a/src/SimpleJson/SimpleJson.cs b/src/SimpleJson/SimpleJson.cs
@@ -1308,6 +1308,14 @@ public virtual object DeserializeObject(object value, Type type)
                         return DateTimeOffset.ParseExact(str, Iso8601Format, CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal | DateTimeStyles.AdjustToUniversal);
                     if (type == typeof(Guid) || (ReflectionUtils.IsNullableType(type) && Nullable.GetUnderlyingType(type) == typeof(Guid)))
                         return new Guid(str);
+                    if (type == typeof(Uri))
+                    {
+                        bool isValid =  Uri.IsWellFormedUriString(str, UriKind.RelativeOrAbsolute);
+
+                        Uri result;
+                        if (isValid && Uri.TryCreate(str, UriKind.RelativeOrAbsolute, out result))
+                            return result;
+                    }
                     return str;
                 }
                 else