More win in serialization scenarios wrt curr.cult.

flq · flq · commit fbdc35524ea2 · 2013-07-23T18:10:24.000+02:00
If the object will be serialized via ToString, it will be checked
whether the object implements IFormattable and then a CultureInvariant
ToString overload is called.
diff --git a/src/ServiceStack.Text/Common/ITypeSerializer.cs b/src/ServiceStack.Text/Common/ITypeSerializer.cs
@@ -20,6 +20,7 @@ internal interface ITypeSerializer
         void WriteObjectString(TextWriter writer, object value);
         void WriteException(TextWriter writer, object value);
         void WriteString(TextWriter writer, string value);
+        void WriteFormattableObjectString(TextWriter writer, object value);
         void WriteDateTime(TextWriter writer, object oDateTime);
         void WriteNullableDateTime(TextWriter writer, object dateTime);
         void WriteDateTimeOffset(TextWriter writer, object oDateTimeOffset);
diff --git a/src/ServiceStack.Text/Common/JsWriter.cs b/src/ServiceStack.Text/Common/JsWriter.cs
@@ -323,6 +323,9 @@ public WriteObjectDelegate GetValueTypeToStringMethod(Type type)
                     ? (WriteObjectDelegate)Serializer.WriteEnumFlags
                     : Serializer.WriteEnum;
 
+            if (type.HasInterface(typeof (IFormattable)))
+                return Serializer.WriteFormattableObjectString;
+
             return Serializer.WriteObjectString;
         }
 
diff --git a/src/ServiceStack.Text/Json/JsonTypeSerializer.cs b/src/ServiceStack.Text/Json/JsonTypeSerializer.cs
@@ -108,6 +108,12 @@ public void WriteObjectString(TextWriter writer, object value)
             JsonUtils.WriteString(writer, value != null ? value.ToString() : null);
         }
 
+        public void WriteFormattableObjectString(TextWriter writer, object value)
+        {
+            var formattable = value as IFormattable;
+            JsonUtils.WriteString(writer, formattable != null ? formattable.ToString(null, CultureInfo.InvariantCulture) : null);
+        }
+
         public void WriteException(TextWriter writer, object value)
         {
             WriteString(writer, ((Exception)value).Message);
diff --git a/src/ServiceStack.Text/Jsv/JsvTypeSerializer.cs b/src/ServiceStack.Text/Jsv/JsvTypeSerializer.cs
@@ -88,7 +88,13 @@ public void WriteString(TextWriter writer, string value)
 			writer.Write(value.EncodeJsv());
 		}
 
-		public void WriteDateTime(TextWriter writer, object oDateTime)
+	    public void WriteFormattableObjectString(TextWriter writer, object value)
+	    {
+	        var f = (IFormattable)value;
+	        writer.Write(f.ToString(null,CultureInfo.InvariantCulture).EncodeJsv());
+	    }
+
+	    public void WriteDateTime(TextWriter writer, object oDateTime)
 		{
 			writer.Write(DateTimeSerializer.ToShortestXsdDateTimeString((DateTime)oDateTime));
 		}

Original file line number	Diff line number	Diff line change
`@@ -323,6 +323,9 @@ public WriteObjectDelegate GetValueTypeToStringMethod(Type type)`
`323`	`323`	`? (WriteObjectDelegate)Serializer.WriteEnumFlags`
`324`	`324`	`: Serializer.WriteEnum;`
`325`	`325`
	`326`	`+ if (type.HasInterface(typeof (IFormattable)))`
	`327`	`+ return Serializer.WriteFormattableObjectString;`
	`328`	`+`
`326`	`329`	`return Serializer.WriteObjectString;`
`327`	`330`	`}`
`328`	`331`
Original file line number	Diff line number	Diff line change
`@@ -108,6 +108,12 @@ public void WriteObjectString(TextWriter writer, object value)`
`108`	`108`	`JsonUtils.WriteString(writer, value != null ? value.ToString() : null);`
`109`	`109`	`}`
`110`	`110`
	`111`	`+ public void WriteFormattableObjectString(TextWriter writer, object value)`
	`112`	`+ {`
	`113`	`+ var formattable = value as IFormattable;`
	`114`	`+ JsonUtils.WriteString(writer, formattable != null ? formattable.ToString(null, CultureInfo.InvariantCulture) : null);`
	`115`	`+ }`
	`116`	`+`
`111`	`117`	`public void WriteException(TextWriter writer, object value)`
`112`	`118`	`{`
`113`	`119`	`WriteString(writer, ((Exception)value).Message);`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,13 @@ public void WriteString(TextWriter writer, string value)`
`88`	`88`	`writer.Write(value.EncodeJsv());`
`89`	`89`	`}`
`90`	`90`
`91`		`- public void WriteDateTime(TextWriter writer, object oDateTime)`
	`91`	`+ public void WriteFormattableObjectString(TextWriter writer, object value)`
	`92`	`+ {`
	`93`	`+ var f = (IFormattable)value;`
	`94`	`+ writer.Write(f.ToString(null,CultureInfo.InvariantCulture).EncodeJsv());`
	`95`	`+ }`
	`96`	`+`
	`97`	`+ public void WriteDateTime(TextWriter writer, object oDateTime)`
`92`	`98`	`{`
`93`	`99`	`writer.Write(DateTimeSerializer.ToShortestXsdDateTimeString((DateTime)oDateTime));`
`94`	`100`	`}`