2 files changed, 56 insertions, 0 deletions
diff --git a/src/format/mod.rs b/src/format/mod.rs
index 558de90..f918287 100644
--- a/src/format/mod.rs
+++ b/src/format/mod.rs
@@ -25,6 +25,7 @@ use context::Context;
 pub mod weechat3;
 pub mod energymech;
 pub mod binary;
+pub mod msgpack;
 
 pub trait Encode<'a, W> where W: Write {
     fn encode(&'a self, context: &'a Context, output: W, event: &'a Event) -> ::Result<()>;
@@ -53,6 +54,7 @@ pub fn decoder<'a>(format: &str) -> Option<Box<DecodeBox<'a, &'a mut BufRead>>>
         "energymech" => Some(Box::new(energymech::Energymech)),
         "weechat3" => Some(Box::new(weechat3::Weechat3)),
         "binary" => Some(Box::new(binary::Binary)),
+        "msgpack" => Some(Box::new(msgpack::Msgpack)),
         _ => None
     }
 }
@@ -62,6 +64,7 @@ pub fn encoder<'a>(format: &str) -> Option<Box<Encode<'a, &'a mut Write>>> {
         "energymech" => Some(Box::new(energymech::Energymech)),
         "weechat3" => Some(Box::new(weechat3::Weechat3)),
         "binary" => Some(Box::new(binary::Binary)),
+        "msgpack" => Some(Box::new(msgpack::Msgpack)),
         _ => None
     }
 }
diff --git a/src/format/msgpack.rs b/src/format/msgpack.rs
new file mode 100644
index 0000000..3519b76
--- /dev/null
+++ b/src/format/msgpack.rs
@@ -0,0 +1,53 @@
+// Copyright 2015 Till Höppner
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use std::io::{ BufRead, Write };
+use std::iter::Iterator;
+use std::marker::PhantomData;
+
+use event::Event;
+use context::Context;
+use format::{ Encode, Decode };
+
+use rustc_serialize::{ Encodable, Decodable };
+use msgpack::{ Encoder, Decoder };
+
+pub struct Msgpack;
+
+pub struct Iter<'a, R: 'a> where R: BufRead {
+    _phantom: PhantomData<&'a ()>,
+    input: R
+}
+
+impl<'a, R: 'a> Iterator for Iter<'a, R> where R: BufRead {
+    type Item = ::Result<Event<'a>>;
+    fn next(&mut self) -> Option<::Result<Event<'a>>> {
+        Some(Decodable::decode(&mut Decoder::new(&mut self.input))
+             .map_err(|_| ::IlcError::BincodeDecode))
+    }
+}
+
+impl<'a, W> Encode<'a, W> for Msgpack where W: Write {
+    fn encode(&'a self, _context: &'a Context, mut output: W, event: &'a Event) -> ::Result<()> {
+        event.encode(&mut Encoder::new(&mut output))
+            .map_err(|_| ::IlcError::BincodeEncode)
+    }
+}
+
+impl<'a, R: 'a> Decode<'a, R> for Msgpack where R: BufRead {
+    type Output = Iter<'a, R>;
+    fn decode(&'a mut self, _context: &'a Context, input: R) -> Iter<R> {
+        Iter { _phantom: PhantomData, input: input }
+    }
+}