em-websocket-server 0.1.2 → 0.13

data/README.markdown

@@ -1,63 +1,56 @@
-#em-websocket-server
-
-* em-websocket-server allows the creation of efficient, evented, websocket services
-
-##Installation
-
-If you don't have gemcutter
-
-	gem install gemcutter
-	gem tumble
-
-Otherwise
-
-	gem install em-websocket-server
-
-Or
-
-	gem install em-websocket-server -s http://gemcutter.org
-
-##Dependencies
-- eventmachine http://github.com/eventmachine/eventmachine
-
-##Docs
-
-Not yet... coming soon
-
-##Quick Example
-
-	require 'rubygems'
-	require 'em-websocket-server'
-	require 'json'
-
-	#create a channel for pub sub
-	$chatroom = EM::Channel.new
-	
-	class ChatServer < WebSocket::Server
-	
-		#subscribe to the channel on client connect
-		def on_connect
-			@sid = $chatroom.subscribe do |msg|
-				send_message msg
-			end
-		end
-		
-		#unsubscribe on client disconnect
-		def on_disconnect
-			$chatroom.unsubscribe(@sid)
-		end
-		
-		#publish the message to the channel on
-		#client message received
-		def on_receive msg
-			$chatroom.push msg
-		end
-	
-	end
-	
-	#start the event machine on port 8000 and have
-	#it instantiate ChatServer objects for each
-	#client connection
-	EM.run do
-		EM.start_server "0.0.0.0", 8000, ChatServer
-	end
+#em-websocket-server
+
+* em-websocket-server allows the creation of efficient, evented, websocket services
+
+##Installation
+
+	gem install em-websocket-server -s http://gemcutter.org
+
+##Dependencies
+- eventmachine http://github.com/eventmachine/eventmachine
+
+##Docs
+
+Not yet... coming soon
+
+##Quick Example
+
+	require 'rubygems'
+	require 'em-websocket-server'
+	require 'json'
+
+	#create a channel for pub sub
+	$chatroom = EM::Channel.new
+	
+	class ChatServer < WebSocket::Server
+	
+		#subscribe to the channel on client connect
+		def on_connect
+			@sid = $chatroom.subscribe do |msg|
+				send_message msg
+			end
+		end
+		
+		#unsubscribe on client disconnect
+		def on_disconnect
+			$chatroom.unsubscribe(@sid)
+		end
+		
+		#publish the message to the channel on
+		#client message received
+		def on_receive msg
+			$chatroom.push msg
+		end
+	
+	end
+	
+	#start the event machine on port 8000 and have
+	#it instantiate ChatServer objects for each
+	#client connection
+	EM.run do
+		EM.start_server "0.0.0.0", 8000, ChatServer
+	end
+	
+##Thanks
+sidonath
+TheBreeze

data/em-websocket-server.gemspec

@@ -1,25 +1,32 @@
-spec = Gem::Specification.new do |s|
-	s.name = 'em-websocket-server'
-	s.version = '0.1.2'
-	s.date = '2009-12-14'
-	s.summary = 'An evented ruby websocket server built on top of EventMachine'
-	s.email = "dan.simpson@gmail.com"
-	s.homepage = "http://github.com/dansimpson/em-websocket-server"
-	s.description = "An evented ruby websocket server built on top of EventMachine"
-	s.has_rdoc = false
-	
-
-	s.authors = ["Dan Simpson"]
-	s.add_dependency('eventmachine', '>= 0.12.4')
-
-
-	s.files = [
-		"README.markdown",
-		"em-websocket-server.gemspec",
-		"lib/web_socket.rb",
-		"lib/web_socket/util.rb",
-		"lib/web_socket/frame.rb",
-		"lib/web_socket/client.rb",
-		"lib/web_socket/server.rb"
-	]
-end
+spec = Gem::Specification.new do |s|
+	s.name = 'em-websocket-server'
+	s.version = '0.13'
+	s.date = '2009-12-14'
+	s.summary = 'An evented ruby websocket server built on top of EventMachine'
+	s.email = "dan.simpson@gmail.com"
+	s.homepage = "http://github.com/dansimpson/em-websocket-server"
+	s.description = "An evented ruby websocket server built on top of EventMachine"
+	s.has_rdoc = false
+	
+
+	s.authors = ["Dan Simpson"]
+	s.add_dependency('eventmachine', '>= 0.12.4')
+
+
+	s.files = [
+		"README.markdown",
+		"em-websocket-server.gemspec",
+		"examples/chat.rb",
+		"examples/chat.html",
+		"examples/timesync.html",
+		"examples/timesync.rb",
+		"examples/tictactoe/tictactoe.html",
+		"examples/tictactoe/tictactoe.js",
+		"examples/tictactoe/tictactoe.rb",
+		"lib/web_socket.rb",
+		"lib/web_socket/client.rb",
+		"lib/web_socket/server.rb",
+		"lib/web_socket/frame.rb",
+		"lib/web_socket/util.rb"
+	]
+end

data/examples/chat.html

@@ -0,0 +1,37 @@
+<!doctype html>
+<html>
+<head>
+	<title>em-websocket-server test</title>
+</head>
+<body>
+
+
+<h1>em-websocket-server chat demo</h1>
+<div id="chat">connecting....</div>
+
+<script>
+
+	var webSocket = new WebSocket('ws://localhost:8000/time');
+
+	webSocket.onopen = function(event){
+		document.getElementById('chat').innerHTML = 'connected';
+	};
+
+	webSocket.onmessage = function(event){
+		document.getElementById('chat').innerHTML += "<br/>" + event.data;
+	};
+
+	webSocket.onclose = function(event){
+		document.getElementById('chat').innerHTML = 'socket closed';
+	};
+	
+	document.getElementById('chatty').addEventListener("onkeypress", function() {
+		webSocket.send("test");
+	});
+	
+</script>
+
+<a href="#" onclick="webSocket.send('test')">Send Test</a>
+
+</body>
+</html>

data/examples/chat.rb

@@ -0,0 +1,70 @@
+$:.unshift File.dirname(__FILE__) + '/../lib'
+
+require 'rubygems'
+require 'web_socket'
+require 'json'
+
+$chatroom = EM::Channel.new
+$messages = 0
+
+class ChatServer < WebSocket::Server
+
+	def on_connect
+	  puts "Server -> Connect"
+		@sid = $chatroom.subscribe do |msg|
+			send_message msg
+		end
+	end
+
+	def on_disconnect
+	  puts "Server -> Handle Disconnect"
+		$chatroom.unsubscribe(@sid)
+	end
+
+	def on_receive msg
+	  
+	  $messages += 1
+	  if($messages % 100 == 0)
+      puts $messages
+    end
+
+		$chatroom.push(msg)
+	end
+
+end
+
+class ChatClient < WebSocket::Client
+
+  def initialize *args
+    super
+  end
+
+	def on_disconnect
+		puts "Client -> Disconnected"
+	end
+
+	def on_connect
+		
+		EM.add_periodic_timer(rand() * 8, EM.Callback(self, :on_timer))
+
+		puts "Client -> connected"
+
+	end
+	
+	def on_timer
+	  send_message "x"
+	end
+
+	def on_receive msg
+	end
+
+end
+
+EM.kqueue
+
+EM.run do
+	EM.start_server "0.0.0.0", 8000, ChatServer
+	5.times do
+	  EM.connect "localhost", 8000, ChatClient
+  end
+end

data/examples/tictactoe/tictactoe.html

@@ -0,0 +1,51 @@
+<!doctype html>
+
+<html>
+<head>
+  <title>Tic Tac Toe</title>
+  <meta name="author" content="Jordan Fowler (TheBreeze)">
+
+  <style type="text/css" media="screen">
+    #navigation ul {
+      list-style-type: none;
+      padding: 0;
+      margin: 25px 0px;
+    }
+
+    #navigation ul li {
+      display: inline;
+      padding: 0;
+      margin: 0;
+      margin-right: 10px;
+    }
+
+    #game-board .cell {
+      width: 100px;
+      height: 100px;
+      padding: 5px;
+      background: #000;
+      color: #FFF;
+      font-size: 100px;
+      text-align: center;
+      vertical-align: middle;
+    }
+  </style>
+</head>
+<body>
+
+<h1>Tic Tac Toe</h1>
+
+<div id="user-count"></div>
+<div id="game-stats"></div>
+<div id="status"></div>
+
+<table id="game-board">
+  <tr><td id="cell-0-0" class="cell"></td><td id="cell-1-0" class="cell"></td><td id="cell-2-0" class="cell"></td></tr>
+  <tr><td id="cell-0-1" class="cell"></td><td id="cell-1-1" class="cell"></td><td id="cell-2-1" class="cell"></td></tr>
+  <tr><td id="cell-0-2" class="cell"></td><td id="cell-1-2" class="cell"></td><td id="cell-2-2" class="cell"></td></tr>
+</table>
+
+<script type="text/javascript" charset="utf-8" src="mootools-1.2.4-core-nc.js"></script>
+<script type="text/javascript" charset="utf-8" src="tictactoe.js"></script>
+</body>
+</html>

data/examples/tictactoe/tictactoe.js

@@ -0,0 +1,130 @@
+// Author: Jordan Fowler (TheBreeze)
+
+var TicTacToe = new Class({
+  wins: 0,
+  loses: 0,
+  draws: 0,
+  methodMap: {
+    'queued': 'onQueued',
+    'start': 'onStart',
+    'turn': 'onTurn',
+    'move': 'onMove',
+    'game_over': 'onGameOver',
+    'win': 'onWin',
+    'loss': 'onLoss',
+    'draw': 'onDraw',
+    'user_count': 'onUserCount'
+  },
+
+  initialize: function() {
+    if (TicTacToe.connection == null) {
+      TicTacToe.connection = new WebSocket('ws://localhost:8000/tictactoe');
+    };
+
+    TicTacToe.connection.onopen = this.join.bind(this);
+    TicTacToe.connection.onmessage = this.onMessage.bind(this);
+    TicTacToe.connection.onclose = this.onGameOver.bind(this);
+
+    this.setGameStats();
+  },
+
+  onMessage: function(event) {
+    var command = JSON.decode(event.data);
+
+    console.log('[RCV] ' + command.msg);
+
+    this[this.methodMap[command.msg]].call(this, command);
+  },
+
+  message: function(msg, options) {
+    var command = JSON.encode({msg: msg, data: options});
+
+    console.log('[SENT] ' + msg);
+
+    TicTacToe.connection.send(command);
+  },
+
+  setStatus: function(status) {
+    $('status').set('text', status);
+  },
+
+  setGameStats: function() {
+    $('game-stats').set('text', 'Wins: '+this.wins+' / Losses: '+this.wins+' / Draws: '+this.draws);
+  },
+
+  setUserCount: function(userCount) {
+    $('user-count').set('text', 'Number of players: ' + userCount);
+  },
+
+  join: function(event) {
+    this.message('join');
+
+    this.setStatus('Connecting you to a game...');
+  },
+
+  reset: function() {
+    $$('.cell').set('text', '');
+
+    this.join();
+  },
+
+  onQueued: function(command) {
+    this.setStatus('Waiting for another player...');
+  },
+
+  onStart: function(command) {
+    this.setStatus('Game found! Their turn first...');
+  },
+
+  onTurn: function(command) {
+    this.setStatus('Your turn...');
+  },
+
+  onMove: function(command) {
+    $('cell-'+command.data.x+'-'+command.data.y).set('text', command.key);
+
+    this.setStatus('Their turn...');
+  },
+
+  move: function(x, y) {
+    this.message('move', {x: x, y: y});
+  },
+
+  onGameOver: function(command) {
+    this.setStatus('Game over.');
+    this.setGameStats();
+    this.reset();
+  },
+
+  onWin: function(command) {
+    this.wins += 1;
+    this.setStatus('Game over. You win!');
+    this.setGameStats();
+  },
+
+  onLoss: function(command) {
+    this.losses += 1;
+    this.setStatus('Game over. You lose!');
+    this.setGameStats();
+  },
+
+  onDraw: function(command) {
+    this.draws += 1;
+    this.setStatus('Game over. It was a draw!');
+    this.setGameStats();
+  },
+
+  onUserCount: function(command) {
+    this.setUserCount(command.data);
+  }
+});
+
+$$('.cell').addEvent('click', function(event) {
+  try {
+    currentGame.move($(this).get('id').split('-')[1], $(this).get('id').split('-')[2]);
+  } catch(error) {
+    alert('Please wait while we connect you to a game...');
+  }
+});
+
+currentGame = new TicTacToe();