support LINQ binary

mythz · mythz · commit 4b71a45319ff · 2012-02-27T06:17:13.000-05:00
diff --git a/NuGet/lib/net35/ServiceStack.Text.dll b/NuGet/lib/net35/ServiceStack.Text.dll
diff --git a/NuGet/servicestack.text.nuspec b/NuGet/servicestack.text.nuspec
@@ -2,7 +2,7 @@
 <package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <id>ServiceStack.Text</id> 
-    <version>3.5.3</version> 
+    <version>3.5.7</version> 
     <authors>Demis Bellot</authors> 
     <owners>Demis Bellot</owners>
     <summary>.NET's fastest JSON, JSV and CSV Text Serializers (3x faster than JSON.NET)</summary>
diff --git a/src/ServiceStack.Text/Common/DeserializeBuiltin.cs b/src/ServiceStack.Text/Common/DeserializeBuiltin.cs
@@ -56,6 +56,8 @@ private static ParseStringDelegate GetParseFn()
 				return value => DateTimeSerializer.ParseShortestXsdDateTime(value);
 			if (typeof(T) == typeof(TimeSpan))
 				return value => TimeSpan.Parse(value);
+			if (typeof(T) == typeof(System.Data.Linq.Binary))
+				return value => new System.Data.Linq.Binary(Convert.FromBase64String(value));
 				
 			if (typeof(T) == typeof(char))
 			{
diff --git a/src/ServiceStack.Text/Common/ITypeSerializer.cs b/src/ServiceStack.Text/Common/ITypeSerializer.cs
@@ -38,6 +38,7 @@ internal interface ITypeSerializer
         void WriteDecimal(TextWriter writer, object decimalValue);
         void WriteEnum(TextWriter writer, object enumValue);
         void WriteEnumFlags(TextWriter writer, object enumFlagValue);
+		void WriteLinqBinary(TextWriter writer, object linqBinaryValue);
 
 		//object EncodeMapKey(object value);
 
diff --git a/src/ServiceStack.Text/Common/JsWriter.cs b/src/ServiceStack.Text/Common/JsWriter.cs
@@ -129,6 +129,7 @@ public JsWriter()
         		{ typeof(Uri), Serializer.WriteObjectString },
         		{ typeof(Type), WriteType },
         		{ typeof(Exception), Serializer.WriteException },
+				{ typeof(System.Data.Linq.Binary), Serializer.WriteLinqBinary },
         	};
         }
 
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 = 3.53m;
+		public static decimal ServiceStackVersion = 3.55m;
 
 		public static bool IsUnix { get; set; }
 
diff --git a/src/ServiceStack.Text/Json/JsonTypeSerializer.cs b/src/ServiceStack.Text/Json/JsonTypeSerializer.cs
@@ -251,6 +251,11 @@ public void WriteEnumFlags(TextWriter writer, object enumFlagValue)
 			writer.Write(intVal);
 		}
 
+		public void WriteLinqBinary(TextWriter writer, object linqBinaryValue)
+		{
+			WriteRawString(writer, Convert.ToBase64String(((System.Data.Linq.Binary)linqBinaryValue).ToArray()));
+		}
+
 		public ParseStringDelegate GetParseFn<T>()
 		{
 			return JsonReader.Instance.GetParseFn<T>();
diff --git a/src/ServiceStack.Text/Jsv/JsvTypeSerializer.cs b/src/ServiceStack.Text/Jsv/JsvTypeSerializer.cs
@@ -196,6 +196,11 @@ public void WriteEnumFlags(TextWriter writer, object enumFlagValue)
 			writer.Write(intVal);
 		}
 
+		public void WriteLinqBinary(TextWriter writer, object linqBinaryValue)
+		{
+			WriteRawString(writer, Convert.ToBase64String(((System.Data.Linq.Binary)linqBinaryValue).ToArray()));
+		}
+
 		public object EncodeMapKey(object value)
 		{
 			return value;
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("3.5.3.*")]
+[assembly: AssemblyVersion("3.5.7.*")]
 //[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/src/ServiceStack.Text/ServiceStack.Text.csproj b/src/ServiceStack.Text/ServiceStack.Text.csproj
@@ -66,6 +66,7 @@
     <Reference Include="System.Core">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
     </Reference>
+    <Reference Include="System.Data.Linq" />
     <Reference Include="System.Runtime.Serialization">
       <RequiredTargetFramework>3.0</RequiredTargetFramework>
     </Reference>

Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,8 @@ private static ParseStringDelegate GetParseFn()`
`56`	`56`	`return value => DateTimeSerializer.ParseShortestXsdDateTime(value);`
`57`	`57`	`if (typeof(T) == typeof(TimeSpan))`
`58`	`58`	`return value => TimeSpan.Parse(value);`
	`59`	`+ if (typeof(T) == typeof(System.Data.Linq.Binary))`
	`60`	`+ return value => new System.Data.Linq.Binary(Convert.FromBase64String(value));`
`59`	`61`
`60`	`62`	`if (typeof(T) == typeof(char))`
`61`	`63`	`{`
Original file line number	Diff line number	Diff line change
`@@ -129,6 +129,7 @@ public JsWriter()`
`129`	`129`	`{ typeof(Uri), Serializer.WriteObjectString },`
`130`	`130`	`{ typeof(Type), WriteType },`
`131`	`131`	`{ typeof(Exception), Serializer.WriteException },`
	`132`	`+ { typeof(System.Data.Linq.Binary), Serializer.WriteLinqBinary },`
`132`	`133`	`};`
`133`	`134`	`}`
`134`	`135`
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 = 3.53m;`
	`26`	`+ public static decimal ServiceStackVersion = 3.55m;`
`27`	`27`
`28`	`28`	`public static bool IsUnix { get; set; }`
`29`	`29`
Original file line number	Diff line number	Diff line change
`@@ -251,6 +251,11 @@ public void WriteEnumFlags(TextWriter writer, object enumFlagValue)`
`251`	`251`	`writer.Write(intVal);`
`252`	`252`	`}`
`253`	`253`
	`254`	`+ public void WriteLinqBinary(TextWriter writer, object linqBinaryValue)`
	`255`	`+ {`
	`256`	`+ WriteRawString(writer, Convert.ToBase64String(((System.Data.Linq.Binary)linqBinaryValue).ToArray()));`
	`257`	`+ }`
	`258`	`+`
`254`	`259`	`public ParseStringDelegate GetParseFn<T>()`
`255`	`260`	`{`
`256`	`261`	`return JsonReader.Instance.GetParseFn<T>();`
Original file line number	Diff line number	Diff line change
`@@ -196,6 +196,11 @@ public void WriteEnumFlags(TextWriter writer, object enumFlagValue)`
`196`	`196`	`writer.Write(intVal);`
`197`	`197`	`}`
`198`	`198`
	`199`	`+ public void WriteLinqBinary(TextWriter writer, object linqBinaryValue)`
	`200`	`+ {`
	`201`	`+ WriteRawString(writer, Convert.ToBase64String(((System.Data.Linq.Binary)linqBinaryValue).ToArray()));`
	`202`	`+ }`
	`203`	`+`
`199`	`204`	`public object EncodeMapKey(object value)`
`200`	`205`	`{`
`201`	`206`	`return value;`