@@ -11,11 +11,18 @@ Copyright (c) 2009 Digg Inc. All rights reserved. import os import base64 +import random +import md5 +from time import time class MXHRStreamer(object): """Simple class that handles streaming multipart payloads""" def __init__(self): self.payloads = [] + self.boundary = "_%d-%s" % (time(), md5.new(str(random.randint(0, 2**32))).hexdigest()) + + def get_boundary(self): + return self.boundary def add_image(self, image, content_type): encoded = base64.b64encode(image) @@ -33,11 +40,11 @@ class MXHRStreamer(object): def stream(self): stream = "" for payload, content_type in self.payloads: - stream += "--|||\n" + stream += "--%s\n" % self.get_boundary() stream += "Content-Type: %s\n" % content_type - stream += payload + stream += "%s\n" % payload - stream += "--|||--" + stream += "--%s--" % self.get_boundary() self.payloads = [] return stream @@ -68,7 +75,7 @@ def main(): """ print "MIME-Version: 1.0" - print "Content-Type: multipart/mixed; boundary=\"|||\"" + print "Content-Type: multipart/mixed; boundary=\"%s\"\n" % streamer.get_boundary() print streamer.stream(), if __name__ == '__main__': examples/Python/demo.py @@ -9,14 +9,21 @@ Copyright (c) 2009 Digg Inc. All rights reserved. =end require 'base64' +require 'digest' class MXHRStreamer def initialize + srand() @payloads = [] + @boundary = "_%d-%s" % [ Time.now.to_i, Digest::MD5.hexdigest(rand(2**32).to_s) ] + end + + def get_boundary + return @boundary end def add_image(image, content_type) - encoded = Base64.b64encode(image) + encoded = Base64.encode64(image) self.add_payload(encoded, content_type) end @@ -35,11 +42,11 @@ class MXHRStreamer def stream stream = "" @payloads.each { |payload, content_type| - stream += "--|||\n" - stream += "Content-Type: " + content_type + "\n" - stream += payload + stream += "--%s\n" % self.get_boundary() + stream += "Content-Type: %s\n\n" % content_type + stream += "%s\n" % payload } - stream += "--|||--" + stream += "--" + self.get_boundary() + "--" @payloads.clear return stream @@ -65,6 +72,6 @@ javascript = "console.log('huuurrrr');/* fake data */" # This is just an example, so remember, you need to set the MIME-Version and # Content-Type headers in your favorite framework -puts "MIME-Version: 1.0" -puts "Content-Type: multipart/mixed; boundary=\"|||\"" +puts "MIME-Version: 1.0\n" +puts "Content-Type: multipart/mixed; boundary=\"" + streamer.get_boundary() + "\"\n\n" puts streamer.stream() examples/Ruby/demo.rb 0053faec5e01ff072003226f743d2bd1b0225ea6 Arsenio Santos arsenio@gmail.com http://github.com/digg/stream/commit/bcee05d8640918938eb1ea74a73fd09832aac5d9 bcee05d8640918938eb1ea74a73fd09832aac5d9 2009-04-10T14:06:06-07:00 2009-04-10T14:06:06-07:00 Using real boundaries for Python and Ruby examples (with a coupla bugfixes along the way) e0354e44f2522fb1adfa615383c3f67c36d3a613 Arsenio Santos arsenio@gmail.com