Support serializing sequences.

5 files changed, 97 insertions, 70 deletions

diff --git a/src/de.rs b/src/de.rs
index 8bf8829..5f605a3 100644
--- a/src/de.rs
+++ b/src/de.rs
@@ -2,24 +2,11 @@
 
 use serde::de;
 
-use fnv::FnvHasher;
-// use serde::de::MapVisitor;
-use std::iter;
-use std::hash::BuildHasherDefault;
-// use std::collections::hash_map::{HashMap, Entry, IntoIter};
 use std::collections::btree_map::{BTreeMap, Entry, IntoIter};
-
-// use std::collections::BTreeMap;
-// type MyHasher = BuildHasherDefault<FnvHasher>;
-
-use std::borrow::Cow;
-
 #[doc(inline)]
 pub use serde::de::value::Error;
 use serde::de::value::MapDeserializer;
 use std::io::Read;
-// use url::form_urlencoded::Parse as UrlEncodedParse;
-use url::form_urlencoded::parse;
 use url::percent_encoding;
 
 /// Deserializes a query-string from a `&[u8]`.
@@ -337,8 +324,6 @@ impl Deserializer {
         }
     }
 
-
-
     /// Returns a new `Deserializer`.
     pub fn new(input: &[u8]) -> Self {
         let map = BTreeMap::default();
diff --git a/src/ser/key.rs b/src/ser/key.rs
index a84f311..eb7ffae 100644
--- a/src/ser/key.rs
+++ b/src/ser/key.rs
@@ -1,5 +1,5 @@
 use ser::{Error};
-use serde::ser::{SerializeStruct};
+use serde::ser::{SerializeSeq, SerializeStruct};
 use ser::part::Sink;
 use serde::Serialize;
 use std::borrow::Cow;
@@ -42,7 +42,7 @@ impl<End, Ok> KeySink<End>
     }
 }
 
-impl<End, Ok> Sink for KeySink<End>
+impl<End, Ok> Sink<Ok, Error> for KeySink<End>
     where End: for<'key> FnOnce(Key<'key>) -> Result<Ok, Error>
 {
 
@@ -93,4 +93,22 @@ where End: for<'key> FnOnce(Key<'key>) -> Result<Ok, Error>
     }
 }
 
+impl<End, Ok> SerializeSeq for KeySink<End>
+where End: for<'key> FnOnce(Key<'key>) -> Result<Ok, Error>
+{
+    type Ok = Ok;
+    type Error = Error;
+
+    fn serialize_element<T: ?Sized + Serialize>(&mut self,
+                                                   _value: &T)
+                                                   -> Result<(), Error> {
+        Err(Error::top_level())
+    }
+
+    fn end(self) -> Result<Self::Ok, Error> {
+        Err(self.unsupported())
+    }
+}
+
+
 
diff --git a/src/ser/mod.rs b/src/ser/mod.rs
index 4b8f484..596730e 100644
--- a/src/ser/mod.rs
+++ b/src/ser/mod.rs
@@ -12,10 +12,7 @@ use std::str;
 use url::form_urlencoded::Serializer as UrlEncodedSerializer;
 use url::form_urlencoded::Target as UrlEncodedTarget;
 
-
-
-
-/// Serializes a value into a `application/x-wwww-url-encoded` `String` buffer.
+/// Serializes a value into a querystring.
 ///
 /// ```
 /// # #[macro_use]
@@ -47,7 +44,7 @@ pub fn to_string<T: ser::Serialize>(input: &T) -> Result<String, Error> {
     Ok(urlencoder.finish())
 }
 
-/// A serializer for the `application/x-www-form-urlencoded` format.
+/// A serializer for the querystring format.
 ///
 /// * Supported top-level inputs are structs, maps and sequences of pairs,
 ///   with or without a given length.
@@ -67,7 +64,7 @@ impl<'output, Target: 'output + UrlEncodedTarget> Serializer<'output, Target> {
     }
 }
 
-/// Errors returned during serializing to `application/x-www-form-urlencoded`.
+/// Errors returned during serializing to querystring.
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub enum Error {
     Custom(Cow<'static, str>),
diff --git a/src/ser/part.rs b/src/ser/part.rs
index d2ade0a..d456f4b 100644
--- a/src/ser/part.rs
+++ b/src/ser/part.rs
@@ -2,112 +2,117 @@ use dtoa;
 use itoa;
 use ser::Error;
 use serde::ser;
+use serde;
 use std::str;
+use std::marker::PhantomData;
 
-pub struct PartSerializer<S> {
+pub struct PartSerializer<SO, S: Sink<SO, Error>> {
     sink: S,
+    marker: PhantomData<SO>,
 }
 
-impl<S: Sink> PartSerializer<S> {
+impl<SO, S: Sink<SO, Error>> PartSerializer<SO, S> {
     pub fn new(sink: S) -> Self {
-        PartSerializer { sink: sink }
+        PartSerializer { sink: sink, marker: PhantomData }
     }
 }
 
-pub trait Sink: Sized + ser::SerializeStruct {
+pub trait Sink<S, E>: Sized + ser::SerializeStruct<Ok=S, Error=E> + ser::SerializeSeq<Ok=S, Error=E>
+  where E: serde::ser::Error
+{
     // type Ok;
-
+    // type Error;
     fn serialize_static_str(self,
                             value: &'static str)
-                            -> Result<Self::Ok, Error>;
+                            -> Result<S, Error>;
 
-    fn serialize_str(self, value: &str) -> Result<Self::Ok, Error>;
-    fn serialize_string(self, value: String) -> Result<Self::Ok, Error>;
-    fn serialize_none(self) -> Result<Self::Ok, Error>;
+    fn serialize_str(self, value: &str) -> Result<S, Error>;
+    fn serialize_string(self, value: String) -> Result<S, Error>;
+    fn serialize_none(self) -> Result<S, Error>;
 
     fn serialize_some<T: ?Sized + ser::Serialize>
         (self,
          value: &T)
-         -> Result<Self::Ok, Error>;
+         -> Result<S, Error>;
 
     fn unsupported(self) -> Error;
 }
 
-impl<S: Sink<Error=Error>> ser::Serializer for PartSerializer<S> {
-    type Ok = S::Ok;
+impl<SO, S: Sink<SO, Error>> ser::Serializer for PartSerializer<SO, S> {
+    type Ok = SO;
     type Error = Error;
-    type SerializeSeq = ser::Impossible<S::Ok, Error>;
-    type SerializeTuple = ser::Impossible<S::Ok, Error>;
-    type SerializeTupleStruct = ser::Impossible<S::Ok, Error>;
-    type SerializeTupleVariant = ser::Impossible<S::Ok, Error>;
-    type SerializeMap = ser::Impossible<S::Ok, Error>;
+    type SerializeSeq = S;
+    type SerializeTuple = ser::Impossible<SO, Error>;
+    type SerializeTupleStruct = ser::Impossible<SO, Error>;
+    type SerializeTupleVariant = ser::Impossible<SO, Error>;
+    type SerializeMap = ser::Impossible<SO, Error>;
     type SerializeStruct = S;
-    type SerializeStructVariant = ser::Impossible<S::Ok, Error>;
+    type SerializeStructVariant = ser::Impossible<SO, Error>;
 
-    fn serialize_bool(self, v: bool) -> Result<S::Ok, Error> {
+    fn serialize_bool(self, v: bool) -> Result<SO, Error> {
         self.sink.serialize_static_str(if v { "true" } else { "false" })
     }
 
-    fn serialize_i8(self, v: i8) -> Result<S::Ok, Error> {
+    fn serialize_i8(self, v: i8) -> Result<SO, Error> {
         self.serialize_integer(v)
     }
 
-    fn serialize_i16(self, v: i16) -> Result<S::Ok, Error> {
+    fn serialize_i16(self, v: i16) -> Result<SO, Error> {
         self.serialize_integer(v)
     }
 
-    fn serialize_i32(self, v: i32) -> Result<S::Ok, Error> {
+    fn serialize_i32(self, v: i32) -> Result<SO, Error> {
         self.serialize_integer(v)
     }
 
-    fn serialize_i64(self, v: i64) -> Result<S::Ok, Error> {
+    fn serialize_i64(self, v: i64) -> Result<SO, Error> {
         self.serialize_integer(v)
     }
 
-    fn serialize_u8(self, v: u8) -> Result<S::Ok, Error> {
+    fn serialize_u8(self, v: u8) -> Result<SO, Error> {
         self.serialize_integer(v)
     }
 
-    fn serialize_u16(self, v: u16) -> Result<S::Ok, Error> {
+    fn serialize_u16(self, v: u16) -> Result<SO, Error> {
         self.serialize_integer(v)
     }
 
-    fn serialize_u32(self, v: u32) -> Result<S::Ok, Error> {
+    fn serialize_u32(self, v: u32) -> Result<SO, Error> {
         self.serialize_integer(v)
     }
 
-    fn serialize_u64(self, v: u64) -> Result<S::Ok, Error> {
+    fn serialize_u64(self, v: u64) -> Result<SO, Error> {
         self.serialize_integer(v)
     }
 
-    fn serialize_f32(self, v: f32) -> Result<S::Ok, Error> {
+    fn serialize_f32(self, v: f32) -> Result<SO, Error> {
         self.serialize_floating(v)
     }
 
-    fn serialize_f64(self, v: f64) -> Result<S::Ok, Error> {
+    fn serialize_f64(self, v: f64) -> Result<SO, Error> {
         self.serialize_floating(v)
     }
 
-    fn serialize_char(self, v: char) -> Result<S::Ok, Error> {
+    fn serialize_char(self, v: char) -> Result<SO, Error> {
         self.sink.serialize_string(v.to_string())
     }
 
-    fn serialize_str(self, value: &str) -> Result<S::Ok, Error> {
+    fn serialize_str(self, value: &str) -> Result<SO, Error> {
         self.sink.serialize_str(value)
     }
 
-    fn serialize_bytes(self, value: &[u8]) -> Result<S::Ok, Error> {
+    fn serialize_bytes(self, value: &[u8]) -> Result<SO, Error> {
         match str::from_utf8(value) {
             Ok(value) => self.sink.serialize_str(value),
             Err(err) => Err(Error::Utf8(err)),
         }
     }
 
-    fn serialize_unit(self) -> Result<S::Ok, Error> {
+    fn serialize_unit(self) -> Result<SO, Error> {
         Err(self.sink.unsupported())
     }
 
-    fn serialize_unit_struct(self, name: &'static str) -> Result<S::Ok, Error> {
+    fn serialize_unit_struct(self, name: &'static str) -> Result<SO, Error> {
         self.sink.serialize_static_str(name.into())
     }
 
@@ -115,7 +120,7 @@ impl<S: Sink<Error=Error>> ser::Serializer for PartSerializer<S> {
                               _name: &'static str,
                               _variant_index: usize,
                               variant: &'static str)
-                              -> Result<S::Ok, Error> {
+                              -> Result<SO, Error> {
         self.sink.serialize_static_str(variant.into())
     }
 
@@ -123,7 +128,7 @@ impl<S: Sink<Error=Error>> ser::Serializer for PartSerializer<S> {
         (self,
          _name: &'static str,
          value: &T)
-         -> Result<S::Ok, Error> {
+         -> Result<SO, Error> {
         value.serialize(self)
     }
 
@@ -133,24 +138,24 @@ impl<S: Sink<Error=Error>> ser::Serializer for PartSerializer<S> {
          _variant_index: usize,
          _variant: &'static str,
          _value: &T)
-         -> Result<S::Ok, Error> {
+         -> Result<SO, Error> {
         Err(self.sink.unsupported())
     }
 
-    fn serialize_none(self) -> Result<S::Ok, Error> {
+    fn serialize_none(self) -> Result<SO, Error> {
         self.sink.serialize_none()
     }
 
     fn serialize_some<T: ?Sized + ser::Serialize>(self,
                                                   value: &T)
-                                                  -> Result<S::Ok, Error> {
+                                                  -> Result<SO, Error> {
         self.sink.serialize_some(value)
     }
 
     fn serialize_seq(self,
                      _len: Option<usize>)
                      -> Result<Self::SerializeSeq, Error> {
-        Err(self.sink.unsupported())
+        Ok(self.sink)
     }
 
 
@@ -209,8 +214,8 @@ impl<S: Sink<Error=Error>> ser::Serializer for PartSerializer<S> {
     }
 }
 
-impl<S: Sink<Error=Error>> PartSerializer<S> {
-    fn serialize_integer<I>(self, value: I) -> Result<S::Ok, Error>
+impl<SO, S: Sink<SO, Error>> PartSerializer<SO, S> {
+    fn serialize_integer<I>(self, value: I) -> Result<SO, Error>
         where I: itoa::Integer,
     {
         let mut buf = [b'\0'; 20];
@@ -219,7 +224,7 @@ impl<S: Sink<Error=Error>> PartSerializer<S> {
         ser::Serializer::serialize_str(self, part)
     }
 
-    fn serialize_floating<F>(self, value: F) -> Result<S::Ok, Error>
+    fn serialize_floating<F>(self, value: F) -> Result<SO, Error>
         where F: dtoa::Floating,
     {
         let mut buf = [b'\0'; 24];
diff --git a/src/ser/value.rs b/src/ser/value.rs
index 56b410e..832cbf3 100644
--- a/src/ser/value.rs
+++ b/src/ser/value.rs
@@ -1,6 +1,6 @@
 use ser::Error;
 use ser::part::{PartSerializer, Sink};
-use serde::ser::{Serialize, SerializeStruct};
+use serde::ser::{Serialize, SerializeSeq, SerializeStruct};
 use std::str;
 use url::form_urlencoded::Serializer as UrlEncodedSerializer;
 use url::form_urlencoded::Target as UrlEncodedTarget;
@@ -10,6 +10,7 @@ pub struct ValueSink<'key, 'target, Target>
 {
     urlencoder: &'target mut UrlEncodedSerializer<Target>,
     key: &'key str,
+    idx: usize,
 }
 
 impl<'key, 'target, Target> ValueSink<'key, 'target, Target>
@@ -21,11 +22,12 @@ impl<'key, 'target, Target> ValueSink<'key, 'target, Target>
         ValueSink {
             urlencoder: urlencoder,
             key: key,
+            idx: 0,
         }
     }
 }
 
-impl<'key, 'target, Target> Sink for ValueSink<'key, 'target, Target>
+impl<'key, 'target, Target> Sink<(), Error> for ValueSink<'key, 'target, Target>
     where Target: 'target + UrlEncodedTarget,
 {
     // type Ok = ();
@@ -43,13 +45,13 @@ impl<'key, 'target, Target> Sink for ValueSink<'key, 'target, Target>
         self.serialize_str(&value)
     }
 
-    fn serialize_none(self) -> Result<Self::Ok, Error> {
+    fn serialize_none(self) -> Result<(), Error> {
         Ok(())
     }
 
     fn serialize_some<T: ?Sized + Serialize>(self,
                                              value: &T)
-                                             -> Result<Self::Ok, Error> {
+                                             -> Result<(), Error> {
         value.serialize(PartSerializer::new(self))
     }
 
@@ -79,3 +81,23 @@ impl<'key, 'target, Target> SerializeStruct for ValueSink<'key, 'target, Target>
     }
 }
 
+impl<'key, 'target, Target> SerializeSeq for ValueSink<'key, 'target, Target>
+    where Target: 'target + UrlEncodedTarget,
+{
+    type Ok = ();
+    type Error = Error;
+
+    fn serialize_element<T: ?Sized + Serialize>(&mut self,
+                                                   value: &T)
+                                                   -> Result<(), Error> {
+        let newk = format!("{}[{}]", self.key, self.idx);
+        self.idx += 1;
+        let value_sink = ValueSink::new(self.urlencoder, &newk);
+        value.serialize(super::part::PartSerializer::new(value_sink))
+    }
+
+    fn end(self) -> Result<Self::Ok, Error> {
+        Ok(())
+    }
+}
+