Merge pull request #357 from flq/culture_issue

Culture issue

Author: mythz

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);

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;
         }
 

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);

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));
 		}

tests/ServiceStack.Text.Net40.Tests/ServiceStack.Text.Net40.Tests.csproj

@@ -68,6 +68,7 @@
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
+    <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\ServiceStack.Text.Tests\AdhocModelTests.cs">

tests/ServiceStack.Text.Tests/StructTests.cs

@@ -1,6 +1,10 @@
 using System;
 using System.Collections.Generic;
+using System.Drawing;
+using System.Globalization;
 using System.Linq;
+using System.Threading;
+using System.Windows;
 using NUnit.Framework;
 using ServiceStack.Text.Common;
 
@@ -253,6 +257,23 @@ public void StaticParseMethod_will_not_throw_on_unstandard_usage()
             Assert.DoesNotThrow(() => ret = StaticParseMethod<DangerousText2>.Parse);
             Assert.IsNull(ret);
         }
+
+        [Test]
+        [TestCase("en")]
+        [TestCase("en-US")]
+        [TestCase("de-CH")]
+        [TestCase("de")]
+        public void test_rect_different_cultures(string culture)
+        {
+            var currentCulture = CultureInfo.GetCultureInfo(culture);
+            Thread.CurrentThread.CurrentCulture = currentCulture;
+            Thread.CurrentThread.CurrentUICulture = currentCulture;
+            var s = new JsonSerializer<Rect>();
+            var r = new Rect(23, 34, 1024, 768);
+            var interim = s.SerializeToString(r);
+            var r2 = s.DeserializeFromString(interim);
+            Assert.AreEqual(r, r2);
+        }
     }
 
     public struct UserStruct