puggernaut 0.1.5 → 0.2.0

data/README.md

@@ -79,7 +79,7 @@ Include [jQuery](http://jquery.com) and [puggernaut.js](https://github.com/winto
 Javascript client example:
 
 <pre>
-Puggernaut.path = '/long_poll';
+Puggernaut.path = '/long_poll'; // (default)
 
 Puggernaut
   .watch('channel', function(e, message) {

data/config/gemsets.yml

@@ -1,4 +1,5 @@
 puggernaut:
+  em-websocket: ~>0.2.1
   eventmachine: ~>0.12.10
   rake: >=0.8.7
   rspec: ~>1.0

data/config/gemspec.yml

@@ -1,5 +1,5 @@
 name: puggernaut
-version: 0.1.5
+version: 0.2.0
 authors:
   - Winton Welsh
 email: mail@wintoni.us
@@ -7,5 +7,6 @@ homepage: http://github.com/winton/puggernaut
 summary: Simple server push implementation using eventmachine and long polling
 description: Simple server push implementation using eventmachine and long polling
 dependencies:
+  - em-websocket
   - eventmachine
 development_dependencies: null

data/lib/puggernaut.rb

@@ -1,8 +1,9 @@
 require File.dirname(__FILE__) + '/puggernaut/gems'
 
-Puggernaut::Gems.activate %w(eventmachine)
+Puggernaut::Gems.activate %w(eventmachine em-websocket)
 
 require 'eventmachine'
+require 'em-websocket'
 
 $:.unshift File.dirname(__FILE__)
 

data/lib/puggernaut/client.rb

@@ -1,5 +1,6 @@
 require "#{File.dirname(__FILE__)}/logger"
 require 'socket'
+require 'timeout'
 
 module Puggernaut
   class Client
@@ -43,9 +44,12 @@ module Puggernaut
       begin
         host_port = "#{host}:#{port}"
         logger.info "Client#send - #{host_port} - #{data}"
-        connection = @connections[host_port] ||= TCPSocket.open(host, port)
-        connection.print(data)
-        response = connection.gets
+        response = nil
+        Timeout.timeout(10) do
+          connection = @connections[host_port] ||= TCPSocket.open(host, port)
+          connection.print(data)
+          response = connection.gets
+        end
         raise 'not ok' if !response || !response.include?('OK')
       rescue Exception => e
         logger.info "Client#send - Exception - #{e.message} - #{host_port} - #{data}"

data/lib/puggernaut/server.rb

@@ -1,44 +1,41 @@
+require 'puggernaut/server/shared'
 require 'puggernaut/server/http'
 require 'puggernaut/server/channel'
 require 'puggernaut/server/tcp'
+require 'puggernaut/server/websocket'
 
 module Puggernaut
   class Server
     
     include Logger
     
-    def initialize(http_port=8100, tcp_port=http_port.to_i+1)
-      puts "\nPuggernaut is starting on #{http_port} (HTTP) and #{tcp_port} (TCP)"
+    def initialize(http_port=8100, tcp_port=http_port.to_i+1, ws_port=tcp_port.to_i+1)
+      puts "\nPuggernaut is starting on #{http_port} (Long Poll HTTP), #{tcp_port} (Puggernaut TCP), and #{ws_port} (WebSocket TCP)"
       puts "*snort*\n\n"
-      
-      errors = 0
-      
-      while errors <= 10
-        begin
-          Channel.channels = []
-          GC.start
-          EM.epoll if EM.epoll?
-          EM.run do
-            logger.info "Server#initialize - Starting HTTP - #{http_port}"
-            EM.start_server '0.0.0.0', http_port, Http
-            
-            logger.info "Server#initialize - Starting TCP - #{tcp_port}"
-            EM.start_server '0.0.0.0', tcp_port, Tcp
-            
-            errors = 0
-          end
-        rescue Interrupt
-          logger.info "Server#initialize - Shutting down"
-          exit
-        rescue
-          errors += 1
-          logger.error "Server#initialize - Error - #{$!.message}"
-          logger.error "\t" + $!.backtrace.join("\n\t")
+
+      begin
+        Channel.channels = []
+        GC.start
+        EM.epoll if EM.epoll?
+        EM.run do
+          logger.info "Server#initialize - Starting HTTP - #{http_port}"
+          EM.start_server '0.0.0.0', http_port, Http
+          
+          logger.info "Server#initialize - Starting TCP - #{tcp_port}"
+          EM.start_server '0.0.0.0', tcp_port, Tcp
+          
+          logger.info "Server#initialize - Starting WebSocket - #{ws_port}"
+          Websocket.new '0.0.0.0', ws_port
+          
+          errors = 0
         end
+      rescue Interrupt
+        logger.info "Server#initialize - Shutting down"
+        exit
+      rescue
+        logger.error "Server#initialize - Error - #{$!.message}"
+        logger.error "\t" + $!.backtrace.join("\n\t")
       end
-      
-      puts "Exiting because of too many consecutive errors :("
-      puts "Check #{Dir.pwd}/log/puggernaut.log\n\n"
     end
   end
 end

data/lib/puggernaut/server/channel.rb

@@ -2,31 +2,32 @@ module Puggernaut
   class Server
     class Channel < EM::Channel
       
-      include Logger
+      attr_reader :channels, :user_id
       
-      attr_reader :channels
-      
-      def initialize(channels)
+      def initialize(channels, user_id)
         @channels = channels
+        @user_id = user_id
         super()
       end
       
       class <<self
+
+        include Logger
         
         attr_accessor :channels
         
-        def create(channels)
-          channel = self.new(channels)
+        def create(channels, user_id)
+          channel = self.new(channels, user_id)
           @channels ||= []
           @channels << channel
           channel
         end
         
-        def all_messages_after(channel, identifier)
+        def all_messages_after_id(channel, identifier)
           if @messages && @messages[channel]
             found = false
             (
-              @messages[channel].select { |(id, message)|
+              @messages[channel].select { |(id, message, time)|
                 found = true if id == identifier
                 found
               }[1..-1] || []
@@ -38,22 +39,45 @@ module Puggernaut
             []
           end
         end
+
+        def all_messages_after_time(channel, after_time)
+          if @messages && @messages[channel]
+            (
+              @messages[channel].select { |(id, message, time)|
+                after_time < time
+              } || []
+
+            ).collect { |message|
+              "#{channel}|#{message.join '|'}"
+            }
+          else
+            []
+          end
+        end
+
+        def inhabitants(channel_name)
+          user_ids = @channels.collect do |channel|
+            channel.user_id if channel.channels.include?(channel_name)
+          end
+          user_ids.compact
+        end
         
-        def say(messages)
+        def say(messages, exclude_user_id=nil)
           @messages ||= {}
           messages = messages.inject({}) do |hash, (channel_name, messages)|
             messages = messages.collect do |message|
-              [ rand.to_s[2..-1], message ]
+              [ rand.to_s[2..-1], message, Time.now ]
             end
             @messages[channel_name] ||= []
             @messages[channel_name] += messages
-            if @messages[channel_name].length > 100
-              @messages[channel_name] = @messages[channel_name][-100..-1]
+            @messages[channel_name] = @messages[channel_name].select do |message|
+              message[2] >= Time.now - 2 * 60 * 60
             end
             hash[channel_name] = messages
             hash
           end
           @channels.each do |channel|
+            next if exclude_user_id && channel.user_id == exclude_user_id
             push = channel.channels.collect do |channel_name|
               if messages[channel_name]
                 messages[channel_name].collect { |message|

data/lib/puggernaut/server/http.rb

@@ -1,10 +1,12 @@
 require 'cgi'
+require 'time'
 
 module Puggernaut
   class Server
     module Http
 
       include Logger
+      include Shared
 
       def receive_data(data)
         lines = data.split(/[\r\n]+/)
@@ -21,27 +23,30 @@ module Puggernaut
         end
 
         if path == '/'
-          channels = query['channel'].dup rescue []
-          lasts = query['last'].dup rescue []
+          channels, @join_leave, lasts, time, user_id = query_defaults(query)
           
           unless channels.empty?
-            @channel = Channel.create(channels)
-            unless lasts.empty?
-              lasts = channels.inject([]) { |array, channel|
-                array += Channel.all_messages_after(channel, lasts.shift)
-                array
-              }.join("\n")
+            @channel = Channel.create(channels, user_id)
+            if @join_leave && user_id
+              join_channels(channels, user_id)
             end
-            unless lasts.empty?
-              respond lasts
+            messages = gather_messages(channels, lasts, time)
+            unless messages.empty?
+              respond messages
             else
               EM::Timer.new(30) { respond }
-              logger.info "Server::Channel#create - Subscribed - #{@channel.channels.join(", ")}"
+              logger.info "Server::Http#receive_data - Subscribed - #{@channel.channels.join(", ")}"
               @subscription_id = @channel.subscribe { |str| respond str }
             end
           else
             respond "no channel specified", 500
           end
+        elsif path == '//inhabitants'
+          channels = query['channel'].dup rescue []
+          user_ids = channels.collect do |c|
+            Channel.inhabitants(c)
+          end
+          respond user_ids.flatten.uniq.join('|')
         else
           respond "not found", 404
         end
@@ -65,6 +70,9 @@ module Puggernaut
         if @subscription_id
           @channel.unsubscribe(@subscription_id)
           logger.info "Sever::Http#unbind - Unsubscribe - #{@channel.channels.join(", ")}"
+          if @join_leave && @channel.user_id
+            leave_channel(channel)
+          end
           Channel.channels.delete @channel
         end
       end

data/lib/puggernaut/server/shared.rb

@@ -0,0 +1,46 @@
+module Puggernaut
+  class Server
+    module Shared
+      
+      def gather_messages(channels, lasts, time)
+        if time
+          channels.inject([]) { |array, channel|
+            array += Channel.all_messages_after_time(channel, Time.parse(time))
+            array
+          }.join("\n")
+        elsif !lasts.empty?
+          channels.inject([]) { |array, channel|
+            array += Channel.all_messages_after_id(channel, lasts.shift)
+            array
+          }.join("\n")
+        else
+          ''
+        end
+      end
+      
+      def join_channels(channels, user_id)
+        Channel.say channels.inject({}) { |hash, channel|
+          hash[channel] = "!PUGJOIN#{user_id}"
+          hash
+        }, user_id
+      end
+      
+      def leave_channel(channel)
+        Channel.say channel.channels.inject({}) { |hash, c|
+          hash[c] = "!PUGLEAVE#{channel.user_id}"
+          hash
+        }, channel.user_id
+      end
+      
+      def query_defaults(query)
+        [
+          (query['channel'].dup rescue []),
+          (query['join_leave'].dup[0] rescue nil),
+          (query['last'].dup rescue []),
+          (query['time'].dup[0] rescue nil),
+          (query['user_id'].dup[0] rescue nil)
+        ]
+      end
+    end
+  end
+end

data/lib/puggernaut/server/websocket.rb

@@ -0,0 +1,47 @@
+module Puggernaut
+  class Server
+    class Websocket
+
+      include Logger
+      include Shared
+      
+      def initialize(host, port)
+        EventMachine::WebSocket.start(:host => host, :port => port) do |ws|
+          ws.onopen do
+            logger.info "Server::Websocket#initialize - Open"
+            channel = nil
+            join_leave = nil
+            joined = nil
+            subscription_id = nil
+            ws.onmessage do |msg|
+              logger.info "Server::Websocket#initialize - Message - #{msg}"
+              channels, join_leave, lasts, time, user_id = query_defaults(CGI.parse(msg))
+              channel ||= Channel.create(channels, user_id)
+              if join_leave && user_id && !joined
+                joined = true
+                join_channels(channels, user_id)
+              end
+              messages = gather_messages(channels, lasts, time)
+              unless messages.empty?
+                ws.send messages
+              else
+                logger.info "Server::Websocket#initialize - Subscribed - #{channel.channels.join(", ")}"
+                subscription_id = channel.subscribe { |str| ws.send str }
+              end
+            end
+            ws.onclose do
+              if subscription_id
+                channel.unsubscribe(subscription_id)
+                logger.info "Sever::Websocket#initialize - Unsubscribe - #{channel.channels.join(", ")}"
+                if join_leave && channel.user_id
+                  leave_channel(channel)
+                end
+                Channel.channels.delete channel
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/puggernaut/spec_server.rb

@@ -26,17 +26,29 @@ class SpecServer < Sinatra::Base
   
   get '/single' do
     begin
-      client = Puggernaut::Client.new("localhost:8001")
+      client = Puggernaut::Client.new("localhost:8101")
       client.push :single => "single message"
       client.close
     rescue Exception => e
       e.message
     end
   end
+
+  get '/join_leave_join' do
+    begin
+      client = Puggernaut::Client.new("localhost:8101")
+      client.push :single => [
+        "!PUGJOINtest", "!PUGLEAVEtest", "!PUGJOINtest"
+      ]
+      client.close
+    rescue Exception => e
+      e.message
+    end
+  end
   
   get '/multiple' do
     begin
-      client = Puggernaut::Client.new("localhost:8001")
+      client = Puggernaut::Client.new("localhost:8101")
       client.push :multiple => [ "multiple message 1", "multiple message 2" ]
       client.close
     rescue Exception => e
@@ -46,7 +58,7 @@ class SpecServer < Sinatra::Base
   
   get '/last/:count' do
     begin
-      client = Puggernaut::Client.new("localhost:8001")
+      client = Puggernaut::Client.new("localhost:8101")
       client.push :last => "last message #{params[:count]}"
       client.close
     rescue Exception => e
@@ -56,7 +68,7 @@ class SpecServer < Sinatra::Base
   
   get '/multiple/channels' do
     begin
-      client = Puggernaut::Client.new("localhost:8001")
+      client = Puggernaut::Client.new("localhost:8101")
       client.push :single => "single message", :multiple => [ "multiple message 1", "multiple message 2" ]
       client.close
     rescue Exception => e

data/public/puggernaut.js

@@ -5,34 +5,43 @@ var Puggernaut = new function() {
 	
 	this.disabled = false;
 	this.path = '/long_poll';
+	this.inhabitants = inhabitants;
 	this.unwatch = unwatch;
 	this.watch = watch;
+	this.watch_join = watch_join;
+	this.watch_leave = watch_leave;
+	this.webSocketPort = webSocketPort;
 	
 	var channels = {};
 	var errors = 0;
 	var events = $('<div/>');
+	var leaves = {};
 	var started = false;
-	
-	function ajax() {
+	var request;
+	var request_id;
+	var port = 8102;
+
+	function ajax(join_leave, time, user_id) {
 		if (channelLength() > 0 && !self.disabled && errors <= 10) {
 			started = true;
-			$.ajax({
+			request = $.ajax({
 				cache: false,
-				data: params(),
+				data: params(join_leave, time, user_id),
 				dataType: 'text',
-				error: function() {
-					errors += 1;
-					ajax();
+				error: function(xhr, status, error) {
+					if (started && status != 'abort') {
+						errors += 1;
+						ajax(join_leave, null, user_id);
+					}
 				},
-				success: function(data) {
-					errors = 0;
-					$.each(data.split("\n"), function(i, line) {
-						line = line.split('|', 3);
-						if (typeof channels[line[0]] != 'undefined')
-							channels[line[0]] = line[1];
-						events.trigger(line[0], line[2]);
-					});
-					ajax();
+				success: function(data, status, xhr) {
+					if (started) {
+						errors = 0;
+						$.each(data.split("\n"), function(i, line) {
+							processMessage(line);
+						});
+						ajax(join_leave, null, user_id);
+					}
 				},
 				timeout: 100000,
 				traditional: true,
@@ -49,31 +58,82 @@ var Puggernaut = new function() {
 		});
 		return length;
 	}
+
+	function inhabitants() {
+		var args = $.makeArray(arguments);
+		var fn = args.pop();
+		$.ajax({
+			cache: false,
+			data: { channel: args },
+			dataType: 'text',
+			success: function(data, status, xhr) {
+				fn(data.split('|'));
+			},
+			traditional: true,
+			url: self.path + '/inhabitants'
+		});
+	}
 	
-	function params() {
+	function params(join_leave, time, user_id) {
 		var ch = [];
 		var la = [];
+
 		$.each(channels, function(channel, last) {
 			ch.push(channel);
-			la.push(last);
+			if (last)
+				la.push(last);
 		});
-		return { channel: ch, last: la };
+		
+		var data = { channel: ch };
+
+		if (la.length)
+			data.last = la;
+		if (join_leave)
+			data.join_leave = join_leave;
+		if (time)
+			data.time = time + '';
+		if (user_id)
+			data.user_id = user_id;
+		
+		return data;
+	}
+	
+	function processMessage(line) {
+		line = line.split('|', 4);
+		if (line[0] && typeof channels[line[0]] != 'undefined') {
+			var id;
+			channels[line[0]] = line[1];
+			if (line[2].substring(0, 8) == '!PUGJOIN') {
+				id = line[2].substring(8);
+				if (leaves[id]) {
+					delete leaves[id];
+					clearTimeout(leaves[id]);
+				} else
+					events.trigger('join_' + line[0], id);
+			} else if (line[2].substring(0, 9) == '!PUGLEAVE') {
+				id = line[2].substring(9);
+				leaves[id] = setTimeout(function() {
+					events.trigger('leave_' + line[0], id);
+				}, 10000);
+			} else
+				events.trigger(line[0], [ line[2], new Date(line[3]) ]);
+		}
 	}
 	
 	function unwatch() {
 		var args = $.makeArray(arguments);
+		started = false;
+		if (request.abort)
+			request.abort();
+		if (request.close)
+			request.close();
 		if (args.length) {
-			if (args[args.length-1].constructor == String)
-				$.each(args, function(i, item) {
-					delete channels[item];
-				});
-			args = $.map(args, function(item) {
-				if (item.constructor == String)
-					return 'watch.' + item;
-				else
-					return item;
+			$.each(args, function(i, item) {
+				delete channels[item];
+				events.unbind(item);
+				events.unbind('join_' + item);
+				events.unbind('leave_' + item);
 			});
-			events.unbind.apply(events, args);
 		} else
 			events.unbind();
 		return this;
@@ -82,6 +142,15 @@ var Puggernaut = new function() {
 	function watch() {
 		var ch = $.makeArray(arguments);
 		var fn = ch.pop();
+		var join_leave, time, user_id;
+
+		if (ch[ch.length-1] && ch[ch.length-1].constructor === Object) {
+			var options = ch.pop();
+
+			join_leave = options.join_leave;
+			time = options.time;
+			user_id = options.user_id;
+		}
 		
 		if (ch.length && fn) {
 			$.each(ch, function(i, item) {
@@ -89,10 +158,67 @@ var Puggernaut = new function() {
 				events.bind(item, fn);
 			});
 			
-			if (!started)
-				ajax();
+			if (!started) {
+				if (window.WebSocket)
+					websocket(join_leave, time, user_id);
+				else
+					ajax(join_leave, time, user_id);
+			}
 		}
 		
 		return this;
 	}
+
+	function watch_join() {
+		var args = $.makeArray(arguments);
+		var fn = args.pop();
+		$.each(args, function(i, item) {
+			events.bind('join_' + item, fn);
+		});
+		return this;
+	}
+
+	function watch_leave() {
+		var args = $.makeArray(arguments);
+		var fn = args.pop();
+		$.each(args, function(i, item) {
+			events.bind('leave_' + item, fn);
+		});
+		return this;
+	}
+	
+	function websocket(join_leave, time, user_id) {
+		if (channelLength() > 0 && !self.disabled && errors <= 10) {
+			started = true;
+			request = new WebSocket("ws://" + window.location.host + ":" + webSocketPort() + "/");
+			request.onopen = function() {
+				errors = 0;
+				if (started)
+					request.send($.param(params(join_leave, time, user_id), true));
+			};
+			request.onmessage = function(evt) {
+				errors = 0;
+				if (started) {
+					$.each(evt.data.split("\n"), function(i, line) {
+						processMessage(line);
+					});
+					request.send($.param(params(join_leave, null, user_id), true));
+				}
+			};
+			request.onerror = function() {
+				errors += 1;
+				if (started)
+					websocket(join_leave, null, user_id);
+			};
+			request.onclose = function() {
+				if (started)
+					websocket(join_leave, null, user_id);
+			};
+		}
+	}
+	
+	function webSocketPort(p) {
+		if (p) port = p;
+		return port;
+	}
 };

data/public/spec.js

@@ -2,8 +2,9 @@ $(function() {
 	
 	module("Single message", {
 		setup: function() {
-			Puggernaut.watch('single', function(e, message) {
+			Puggernaut.watch('single', function(e, message, time) {
 				equals(message, 'single message');
+				ok(time.constructor === Date);
 				Puggernaut.unwatch('single');
 				start();
 			});
@@ -12,15 +13,100 @@ $(function() {
 	
 	test("should receive a message", function() {
 		stop();
+		expect(2);
 		$.get('/single');
 	});
+
+	module("Single message unbind", {
+		setup: function() {
+			Puggernaut.watch('single', function(e, message, time) {
+				equals(message, 'single message');
+				ok(time.constructor === Date);
+				time_test = [ message, time ];
+				Puggernaut.unwatch('single');
+			});
+		}
+	});
+
+	test("should only receive one message", function() {
+		stop();
+		expect(2);
+		$.get('/single', function() {
+			$.get('/single', function() {
+				setTimeout(function() {
+					start();
+				}, 2000);
+			});
+		});
+	});
+
+	module("Single message after time");
+
+	test("should receive messages after time", function() {
+		stop();
+		expect(2);
+		var time_now = new Date();
+		$.get('/single', function() {
+			Puggernaut.watch('single', { time: time_now }, function(e, message, time) {
+				equals(message, 'single message');
+				ok(time.constructor === Date);
+				Puggernaut.unwatch('single');
+				start();
+			});
+		});
+	});
+
+	module("Single message inhabitants", {
+		setup: function() {
+			Puggernaut.watch('single', { user_id: 'test' }, function(e, message, time) {
+				setTimeout(function() {
+					Puggernaut.inhabitants('single', function(users) {
+						equals(users[0], 'test');
+						equals(users.length, 1);
+						Puggernaut.unwatch('single');
+						start();
+					});
+				}, 1000);
+			});
+		}
+	});
+	
+	test("should receive a message", function() {
+		stop();
+		expect(2);
+		$.get('/single');
+	});
+
+	module("Single message join/leave/join", {
+		setup: function() {
+			Puggernaut
+				.watch('single', { join_leave: true }, function(e, message, time) {})
+				.watch_join('single', function(e, user_id) {
+					equals(user_id, 'test');
+					setTimeout(function() {
+						Puggernaut.unwatch('single');
+						start();
+					}, 1000);
+				})
+				.watch_leave('single', function(e, user_id) {
+					ok(false);
+				});
+		}
+	});
+	
+	test("should trigger join event without leave", function() {
+		stop();
+		expect(1);
+		$.get('/join_leave_join');
+	});
 	
 	module("Multiple messages", {
 		setup: function() {
 			var executions = 0;
-			Puggernaut.watch('multiple', function(e, message) {
+			Puggernaut.watch('multiple', function(e, message, time) {
 				executions += 1;
 				equals(message, 'multiple message ' + executions);
+				ok(time.constructor === Date);
 				if (executions == 2) {
 					Puggernaut.unwatch('multiple');
 					start();
@@ -31,23 +117,21 @@ $(function() {
 	
 	test("should receive multiple messages", function() {
 		stop();
+		expect(4);
 		$.get('/multiple');
 	});
 	
 	module("Last message", {
 		setup: function() {
-			Puggernaut.watch('last', function(e, message) {
-				if (message != 'last message 2') {
-					equals(message, 'last message 1');
-					Puggernaut.disabled = true;
-					$.get('/last/2', function() {
-						Puggernaut.disabled = false;
-						Puggernaut.watch('last', function(e, message) {
-							equals(message, 'last message 2');
-							Puggernaut.unwatch('last');
-							start();
-						});
-					});
+			Puggernaut.watch('last', function(e, message, time) {
+				if (message == 'last message 1') {
+					ok(time.constructor === Date);
+					$.get('/last/2');
+				}
+				if (message == 'last message 2') {
+					ok(time.constructor === Date);
+					Puggernaut.unwatch('last');
+					start();
 				}
 			});
 		}
@@ -55,6 +139,7 @@ $(function() {
 	
 	test("should pick up last message", function() {
 		stop();
+		expect(2);
 		$.get('/last/1');
 	});
 	
@@ -62,6 +147,7 @@ $(function() {
 	
 	test("should receive all messages", function() {
 		stop();
+		expect(6);
 		
 		var executions = 0;
 		var total_runs = 0;
@@ -69,9 +155,10 @@ $(function() {
 		Puggernaut.disabled = true;
 		
 		Puggernaut
-			.watch('single', function(e, message) {
+			.watch('single', function(e, message, time) {
 				total_runs += 1;
 				equals(message, 'single message');
+				ok(time.constructor === Date);
 				Puggernaut.unwatch('single');
 				if (total_runs == 3)
 					start();
@@ -80,10 +167,11 @@ $(function() {
 		Puggernaut.disabled = false;
 		
 		Puggernaut
-			.watch('multiple', function(e, message) {
+			.watch('multiple', function(e, message, time) {
 				executions += 1;
 				total_runs += 1;
 				equals(message, 'multiple message ' + executions);
+				ok(time.constructor === Date);
 				if (executions == 2)
 					Puggernaut.unwatch('multiple');
 				if (total_runs == 3)

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: puggernaut
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 23
+  prerelease: 
   segments: 
   - 0
-  - 1
-  - 5
-  version: 0.1.5
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Winton Welsh
@@ -14,24 +15,41 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-24 00:00:00 -08:00
+date: 2011-03-15 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: eventmachine
+  name: em-websocket
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 0
+        - 2
+        - 1
+        version: 0.2.1
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: eventmachine
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 59
         segments: 
         - 0
         - 12
         - 10
         version: 0.12.10
   type: :runtime
-  version_requirements: *id001
+  version_requirements: *id002
 description: Simple server push implementation using eventmachine and long polling
 email: mail@wintoni.us
 executables: 
@@ -56,7 +74,9 @@ files:
 - lib/puggernaut/server.rb
 - lib/puggernaut/server/channel.rb
 - lib/puggernaut/server/http.rb
+- lib/puggernaut/server/shared.rb
 - lib/puggernaut/server/tcp.rb
+- lib/puggernaut/server/websocket.rb
 - lib/puggernaut/spec_server.rb
 - public/jquery.js
 - public/puggernaut.js
@@ -85,6 +105,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -93,13 +114,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: Simple server push implementation using eventmachine and long polling