UrlEncode string values in QueryStringSerializer

Author: mythz

src/ServiceStack.Text/Common/WriteType.cs

@@ -443,7 +443,8 @@ public static void WriteQueryString(TextWriter writer, object value)
                         writer.Write('&');
 
                     var propertyType = propertyValue.GetType();
-                    var isEnumerable = !(propertyValue is string)
+                    var strValue = propertyValue as string;
+                    var isEnumerable = strValue == null
                         && !(propertyType.IsValueType())
                         && propertyType.HasInterface(typeof(IEnumerable));
 
@@ -457,7 +458,11 @@ public static void WriteQueryString(TextWriter writer, object value)
                     Serializer.WritePropertyName(writer, propertyWriter.PropertyName);
                     writer.Write('=');
 
-                    if (!isEnumerable)
+                    if (strValue != null)
+                    {
+                        writer.Write(strValue.UrlEncode());
+                    }
+                    else if (!isEnumerable)
                     {
                         propertyWriter.WriteFn(writer, propertyValue);
                     }

tests/ServiceStack.Text.Tests/QueryStringSerializerTests.cs

@@ -122,8 +122,8 @@ public void Deos_serialize_QueryStrings()
         [Test]
         public void Can_serialize_quoted_strings()
         {
-            Assert.That(QueryStringSerializer.SerializeToString(new B { Property = "\"quoted content\"" }), Is.EqualTo("Property=%22%22quoted+content%22%22"));
-            Assert.That(QueryStringSerializer.SerializeToString(new B { Property = "\"quoted content, and with a comma\"" }), Is.EqualTo("Property=%22%22quoted+content,+and+with+a+comma%22%22"));
+            Assert.That(QueryStringSerializer.SerializeToString(new B { Property = "\"quoted content\"" }), Is.EqualTo("Property=%22quoted+content%22"));
+            Assert.That(QueryStringSerializer.SerializeToString(new B { Property = "\"quoted content, and with a comma\"" }), Is.EqualTo("Property=%22quoted+content,+and+with+a+comma%22"));
         }
 
         private T StringToPoco<T>(string str)
@@ -184,6 +184,24 @@ public void Can_deserialize_with_comma_in_property_in_list_from_static()
             Assert.That(poco.ListOfA[0].ListOfB[0].Property3, Is.EqualTo("John"));
         }
 
+        [Test]
+        public void Can_serialize_Poco_with_comma_in_string()
+        {
+            var dto = new B { Property = "Foo,Bar" };
+            var qs = QueryStringSerializer.SerializeToString(dto);
+
+            Assert.That(qs, Is.EqualTo("Property=Foo,Bar"));
+        }
+
+        [Test]
+        public void Does_urlencode_Poco_with_escape_char()
+        {
+            var dto = new B { Property = "Foo&Bar" };
+            var qs = QueryStringSerializer.SerializeToString(dto);
+
+            Assert.That(qs, Is.EqualTo("Property=Foo%26Bar"));
+        }
+
         public class TestPocos
         {
             public List<A> ListOfA { get; set; }