Refactor Serialize logic to produce correct strings.

Removes the dependency on the `url` crate because we only need
the percent decoding, with our own encoding set.

All keys/values are conservatively percent-encoded, but the square
brackets are untouched. Compatible with strict decoding, and
potentially less error prone.

2 files changed, 24 insertions, 14 deletions

diff --git a/tests/test_deserialize.rs b/tests/test_deserialize.rs
index e0392f5..a71e4bf 100644
--- a/tests/test_deserialize.rs
+++ b/tests/test_deserialize.rs
@@ -443,4 +443,21 @@ fn strict_mode() {
 
     let params: Result<Query, _> = loose_config.deserialize_str("vec%5B0%5D%5Ba%5D]=1&vec[1][a]=2");
     assert_eq!(params.unwrap(), Query { vec: vec![Test { a: 1 }, Test { a: 2 }] });
+
+    #[derive(Deserialize,Serialize,Debug, PartialEq)]
+    struct OddTest {
+        #[serde(rename="[but&why=?]")]
+        a: u8
+    }
+
+    let params = OddTest { a: 12 };
+    let enc_params = qs::to_string(&params).unwrap();
+    println!("Enocded as: {}", enc_params);
+    let rec_params: Result<OddTest, _> = strict_config.deserialize_str(&enc_params);
+    assert_eq!(rec_params.unwrap(), params);
+
+    // Non-strict decoding cannot necessarily handle these weird scenerios.
+    let rec_params: Result<OddTest, _> = loose_config.deserialize_str(&enc_params);
+    assert!(rec_params.is_err());
+    println!("{}", rec_params.unwrap_err());
 }
\ No newline at end of file
diff --git a/tests/test_serialize.rs b/tests/test_serialize.rs
index 7d9c38f..a2b725f 100644
--- a/tests/test_serialize.rs
+++ b/tests/test_serialize.rs
@@ -31,15 +31,10 @@ fn serialize_struct() {
         user_ids: vec![1, 2, 3, 4],
     };
 
-    assert_eq!(qs::to_string(&params).unwrap(),
-               urlencode("\
+    assert_eq!(qs::to_string(&params).unwrap(),"\
         id=42&name=Acme&phone=12345&address[city]=Carrot+City&\
         address[postcode]=12345&user_ids[0]=1&user_ids[1]=2&\
-        user_ids[2]=3&user_ids[3]=4"));
-}
-
-fn urlencode(input: &str) -> String {
-    str::replace(&str::replace(input, "[", "%5B"), "]", "%5D")
+        user_ids[2]=3&user_ids[3]=4");
 }
 
 #[test]
@@ -56,7 +51,7 @@ fn serialize_option() {
     let rec_params = qs::to_string(&query).unwrap();
     assert_eq!(rec_params, params);
 
-    let params = urlencode("vec[0]=1&vec[1]=2");
+    let params = "vec[0]=1&vec[1]=2";
     let query = Query {
         vec: Some(vec![1,2]),
     };
@@ -80,33 +75,31 @@ fn serialize_enum() {
         e: TestEnum,
     }
 
-    let params = urlencode("e=a");
+    let params = "e=a";
     let query = Query {
         e: TestEnum::A,
     };
     let rec_params = qs::to_string(&query).unwrap();
     assert_eq!(rec_params, params);
 
-   let params = urlencode("e[b]=true");
+   let params = "e[b]=true";
    let query = Query {
        e: TestEnum::B(true),
    };
    let rec_params = qs::to_string(&query).unwrap();
    assert_eq!(rec_params, params);
 
-   let params = urlencode("e[c][x]=2&e[c][y]=3");
+   let params = "e[c][x]=2&e[c][y]=3";
    let query = Query {
        e: TestEnum::C { x: 2, y: 3 },
    };
    let rec_params = qs::to_string(&query).unwrap();
    assert_eq!(rec_params, params);
 
-   let params = urlencode("e[d][0]=128&e[d][1]=1");
+   let params = "e[d][0]=128&e[d][1]=1";
    let query = Query {
        e: TestEnum::D(128, 1),
    };
    let rec_params = qs::to_string(&query).unwrap();
    assert_eq!(rec_params, params);
-
-   
 }
\ No newline at end of file