ensure dynamic objects write out type info and use it to deserialize.

mythz · mythz · commit a9c91b01a78b · 2011-10-30T04:50:09.000-04:00
diff --git a/NuGet/lib/net35/ServiceStack.Text.XML b/NuGet/lib/net35/ServiceStack.Text.XML
diff --git a/NuGet/lib/net35/ServiceStack.Text.dll b/NuGet/lib/net35/ServiceStack.Text.dll
diff --git a/src/ServiceStack.Text/Common/DeserializeType.cs b/src/ServiceStack.Text/Common/DeserializeType.cs
@@ -95,6 +95,42 @@ private static object StringToType(Type type, string strType,
 
 				if (instance == null) instance = ctorFn();
 
+				if (propertyValueString != null 
+				    && propertyValueString.Length >= JsWriter.TypeAttrInObject.Length
+				    && propertyValueString.Substring(0, JsWriter.TypeAttrInObject.Length) == JsWriter.TypeAttrInObject)
+				{
+					var propIndex = JsWriter.TypeAttrInObject.Length;
+					var typeName = Serializer.EatValue(propertyValueString, ref propIndex);
+					typeName = typeName.Substring(1, typeName.Length - 2); //remove quotes
+					var propType = AssemblyUtils.FindType(typeName);
+					if (propType == null)
+					{
+						Tracer.Instance.WriteWarning("Could not find type: " + typeName);
+					}
+					else
+					{
+						try
+						{
+							var parseFn = Serializer.GetParseFn(propType);
+							var propertyValue = parseFn(propertyValueString);
+	
+							setterMap.TryGetValue(propertyName, out setterFn);
+	
+							if (setterFn != null)
+							{
+								setterFn(instance, propertyValue);
+							}
+						}
+						catch (Exception)
+						{
+							Tracer.Instance.WriteWarning("WARN: failed to set dynamic property {0} with: {1}", propertyName, propertyValueString);
+						}
+					}
+
+					Serializer.EatItemSeperatorOrMapEndChar(strType, ref index);
+					continue;					
+				}
+
 				parseStringFnMap.TryGetValue(propertyName, out parseStringFn);
 
 				if (parseStringFn != null)
diff --git a/src/ServiceStack.Text/Common/JsState.cs b/src/ServiceStack.Text/Common/JsState.cs
@@ -1,14 +1,14 @@
-using System;
-
-namespace ServiceStack.Text.Common
-{
-	internal static class JsState
-	{
-		//Exposing field for perf
-		[ThreadStatic]
-		public static int WritingKeyCount = 0;
-
-		[ThreadStatic]
-		public static bool IsWritingValue = false;
-	}
+using System;
+
+namespace ServiceStack.Text.Common
+{
+	internal static class JsState
+	{
+		//Exposing field for perf
+		[ThreadStatic] internal static int WritingKeyCount = 0;
+
+		[ThreadStatic] internal static bool IsWritingValue = false;
+
+		[ThreadStatic] internal static bool IsWritingDynamic = false;
+	}
 }
diff --git a/src/ServiceStack.Text/Common/JsWriter.cs b/src/ServiceStack.Text/Common/JsWriter.cs
@@ -11,6 +11,7 @@ namespace ServiceStack.Text.Common
 	public static class JsWriter
 	{
 		public const string TypeAttr = "__type";
+		public const string TypeAttrInObject = "{\"__type\":";
 
 		public const char MapStartChar = '{';
 		public const char MapKeySeperator = ':';
@@ -275,7 +276,7 @@ public WriteObjectDelegate GetSpecialWriteFn(Type type)
 
 		public void WriteType(TextWriter writer, object value)
 		{
-			Serializer.WriteRawString(writer, AssemblyUtils.ToTypeString((Type)value));
+			Serializer.WriteRawString(writer, ((Type)value).ToTypeString());
 		}
 
 	}
diff --git a/src/ServiceStack.Text/Common/WriteType.cs b/src/ServiceStack.Text/Common/WriteType.cs
@@ -116,6 +116,10 @@ public static void WriteProperties(TextWriter writer, object value)
 			{
 				WriteTypeInfo(writer, value);
 			}
+			else if (JsState.IsWritingDynamic)
+			{
+				TypeInfoWriter(writer, value);
+			}
 
 			if (PropertyWriters != null)
 			{
diff --git a/src/ServiceStack.Text/Env.cs b/src/ServiceStack.Text/Env.cs
@@ -23,7 +23,7 @@ static Env()
 				+ (IsMonoTouch ? " MonoTouch" : "");
 		}
 
-		public static decimal ServiceStackVersion = 2.27m;
+		public static decimal ServiceStackVersion = 2.28m;
 
 		public static bool IsUnix { get; set; }
 
diff --git a/src/ServiceStack.Text/Json/JsonWriter.Generic.cs b/src/ServiceStack.Text/Json/JsonWriter.Generic.cs
@@ -57,7 +57,11 @@ public static void WriteLateBoundObject(TextWriter writer, object value)
 		{
 			if (value == null) return;
 			var writeFn = GetWriteFn(value.GetType());
+
+			var prevState = JsState.IsWritingDynamic;
+			JsState.IsWritingDynamic = true;
 			writeFn(writer, value);
+			JsState.IsWritingDynamic = prevState;
 		}
 
 		public static WriteObjectDelegate GetValueTypeToStringMethod(Type type)
diff --git a/src/ServiceStack.Text/Jsv/JsvWriter.Generic.cs b/src/ServiceStack.Text/Jsv/JsvWriter.Generic.cs
@@ -57,7 +57,11 @@ public static void WriteLateBoundObject(TextWriter writer, object value)
 		{
 			if (value == null) return;
 			var writeFn = GetWriteFn(value.GetType());
+
+			var prevState = JsState.IsWritingDynamic;
+			JsState.IsWritingDynamic = true;
 			writeFn(writer, value);
+			JsState.IsWritingDynamic = prevState;
 		}
 
 		public static WriteObjectDelegate GetValueTypeToStringMethod(Type type)
diff --git a/src/ServiceStack.Text/Properties/AssemblyInfo.cs b/src/ServiceStack.Text/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.2.6.*")]
+[assembly: AssemblyVersion("2.2.8.*")]
 //[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/tests/ServiceStack.Text.Tests/InterfaceTests.cs b/tests/ServiceStack.Text.Tests/InterfaceTests.cs
@@ -41,7 +41,21 @@ public class DtoWithInterface
 		[Test]
 		public void Can_deserialize_interface_into_concrete_type()
 		{
-			Serialize(new DtoWithInterface { Results = new Message<string>("Body") }, includeXml:false);
+			var dto = Serialize(new DtoWithInterface { Results = new Message<string>("Body") }, includeXml:false);
+			Assert.That(dto.Results, Is.Not.Null);
+		}
+
+		public class DtoWithObject
+		{
+			public object Results { get; set; }
+		}
+
+		[Test]
+		public void Can_deserialize_dto_with_object()
+		{
+			var dto = Serialize(new DtoWithObject { Results = new Message<string>("Body") }, includeXml: false);
+			Assert.That(dto.Results, Is.Not.Null);
+			Assert.That(dto.Results.GetType(), Is.EqualTo(typeof(Message<string>)));
 		}
 		
 		[Test]
diff --git a/tests/ServiceStack.Text.Tests/Utils/JsvFormatterTests.cs b/tests/ServiceStack.Text.Tests/Utils/JsvFormatterTests.cs
@@ -1,64 +1,66 @@
-﻿using System;
-using System.Collections.Generic;
-using NUnit.Framework;
-using ServiceStack.Common.Tests.Models;
-
-namespace ServiceStack.Text.Tests.Utils
-{
-	[TestFixture]
-	public class JsvFormatterTests
-	{
-		[Test]
-		public void Can_PrettyFormat_generic_type()
-		{
-			var model = new ModelWithIdAndName { Id = 1, Name = "Name" };
-			var modelStr = model.Dump();
-
-			Assert.That(modelStr, Is.EqualTo("{\r\n\tId: 1,\r\n\tName: Name\r\n}"));
-		}
-
-		[Test]
-		public void Can_PrettyFormat_object()
-		{
-			object model = new ModelWithIdAndName { Id = 1, Name = "Name" };
-			var modelStr = model.Dump();
-
-			Assert.That(modelStr, Is.EqualTo("{\r\n\tId: 1,\r\n\tName: Name\r\n}"));
-		}
-
-		internal class TestModel
-		{
-			public TestModel()
-			{
-				this.Int = 1;
-				this.String = "One";
-				this.DateTime = DateTime.UtcNow.Date;
-				this.Guid = Guid.NewGuid();
-				this.EmptyIntList = new List<int>();
-				this.IntList = new List<int> { 1, 2, 3 };
-				this.StringList = new List<string> { "one", "two", "three" };
-				this.StringIntMap = new Dictionary<string, int>
-    				{
-    					{"a", 1},{"b", 2},{"c", 3},
-    				};
-			}
-
-			public int Int { get; set; }
-			public string String { get; set; }
-			public DateTime DateTime { get; set; }
-			public Guid Guid { get; set; }
-			public List<int> EmptyIntList { get; set; }
-			public List<int> IntList { get; set; }
-			public List<string> StringList { get; set; }
-			public Dictionary<string, int> StringIntMap { get; set; }
-		}
-
-		[Test]
-		public void Can_DumpModel()
-		{
-			var model = new TestModel();
-			Console.WriteLine(model.Dump());
-		}
-
-	}
+﻿using System;
+using System.Collections.Generic;
+using NUnit.Framework;
+using ServiceStack.Common.Tests.Models;
+
+namespace ServiceStack.Text.Tests.Utils
+{
+	[TestFixture]
+	public class JsvFormatterTests
+	{
+		[Test]
+		public void Can_PrettyFormat_generic_type()
+		{
+			var model = new ModelWithIdAndName { Id = 1, Name = "Name" };
+			var modelStr = model.Dump();
+
+			Assert.That(modelStr, Is.EqualTo("{\r\n\tId: 1,\r\n\tName: Name\r\n}"));
+		}
+
+		[Test]
+		public void Can_PrettyFormat_object()
+		{
+			object model = new ModelWithIdAndName { Id = 1, Name = "Name" };
+			var modelStr = model.Dump();
+
+			Console.WriteLine(modelStr);
+
+			Assert.That(modelStr, Is.EqualTo("{\r\n\t\"__type\": \"ServiceStack.Common.Tests.Models.ModelWithIdAndName,\r\n\t ServiceStack.Common.Tests\",\r\n\tId: 1,\r\n\tName: Name\r\n}"));
+		}
+
+		internal class TestModel
+		{
+			public TestModel()
+			{
+				this.Int = 1;
+				this.String = "One";
+				this.DateTime = DateTime.UtcNow.Date;
+				this.Guid = Guid.NewGuid();
+				this.EmptyIntList = new List<int>();
+				this.IntList = new List<int> { 1, 2, 3 };
+				this.StringList = new List<string> { "one", "two", "three" };
+				this.StringIntMap = new Dictionary<string, int>
+    				{
+    					{"a", 1},{"b", 2},{"c", 3},
+    				};
+			}
+
+			public int Int { get; set; }
+			public string String { get; set; }
+			public DateTime DateTime { get; set; }
+			public Guid Guid { get; set; }
+			public List<int> EmptyIntList { get; set; }
+			public List<int> IntList { get; set; }
+			public List<string> StringList { get; set; }
+			public Dictionary<string, int> StringIntMap { get; set; }
+		}
+
+		[Test]
+		public void Can_DumpModel()
+		{
+			var model = new TestModel();
+			Console.WriteLine(model.Dump());
+		}
+
+	}
 }

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ namespace ServiceStack.Text.Common`
`11`	`11`	`public static class JsWriter`
`12`	`12`	`{`
`13`	`13`	`public const string TypeAttr = "__type";`
	`14`	`+ public const string TypeAttrInObject = "{\"__type\":";`
`14`	`15`
`15`	`16`	`public const char MapStartChar = '{';`
`16`	`17`	`public const char MapKeySeperator = ':';`
`@@ -275,7 +276,7 @@ public WriteObjectDelegate GetSpecialWriteFn(Type type)`
`275`	`276`
`276`	`277`	`public void WriteType(TextWriter writer, object value)`
`277`	`278`	`{`
`278`		`- Serializer.WriteRawString(writer, AssemblyUtils.ToTypeString((Type)value));`
	`279`	`+ Serializer.WriteRawString(writer, ((Type)value).ToTypeString());`
`279`	`280`	`}`
`280`	`281`
`281`	`282`	`}`
Original file line number	Diff line number	Diff line change
`@@ -116,6 +116,10 @@ public static void WriteProperties(TextWriter writer, object value)`
`116`	`116`	`{`
`117`	`117`	`WriteTypeInfo(writer, value);`
`118`	`118`	`}`
	`119`	`+ else if (JsState.IsWritingDynamic)`
	`120`	`+ {`
	`121`	`+ TypeInfoWriter(writer, value);`
	`122`	`+ }`
`119`	`123`
`120`	`124`	`if (PropertyWriters != null)`
`121`	`125`	`{`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ static Env()`
`23`	`23`	`+ (IsMonoTouch ? " MonoTouch" : "");`
`24`	`24`	`}`
`25`	`25`
`26`		`- public static decimal ServiceStackVersion = 2.27m;`
	`26`	`+ public static decimal ServiceStackVersion = 2.28m;`
`27`	`27`
`28`	`28`	`public static bool IsUnix { get; set; }`
`29`	`29`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,11 @@ public static void WriteLateBoundObject(TextWriter writer, object value)`
`57`	`57`	`{`
`58`	`58`	`if (value == null) return;`
`59`	`59`	`var writeFn = GetWriteFn(value.GetType());`
	`60`	`+`
	`61`	`+ var prevState = JsState.IsWritingDynamic;`
	`62`	`+ JsState.IsWritingDynamic = true;`
`60`	`63`	`writeFn(writer, value);`
	`64`	`+ JsState.IsWritingDynamic = prevState;`
`61`	`65`	`}`
`62`	`66`
`63`	`67`	`public static WriteObjectDelegate GetValueTypeToStringMethod(Type type)`