puggernaut 0.2.0 → 0.2.1

data/README.md

@@ -15,11 +15,12 @@ gem install puggernaut
 How it works
 ------------
 
-Puggernaut consists of three pieces:
+Puggernaut consists of four pieces:
 
 * TCP client to send push messages
 * TCP server to receive push messages
-* HTTP server to deliver long poll requests
+* TCP server to deliver messages via WebSockets ([em-websocket](https://github.com/igrigorik/em-websocket))
+* HTTP server to deliver messages via long poll
 
 Start it up
 -----------
@@ -27,34 +28,25 @@ Start it up
 Run the <code>puggernaut</code> binary with optional port numbers:
 
 <pre>
-puggernaut &lt;http port&gt; &lt;tcp port&gt;
+puggernaut &lt;http port&gt; &lt;tcp port&gt; &lt;tcp port (websocket)&gt;
 </pre>
 
-The default HTTP and TCP ports are 8100 and 8101, respectively.
+The default HTTP and TCP ports are 8100, 8101, and 8102, respectively.
 
 Set up proxy pass
 -----------------
 
-You will need to set up a URL on your public facing web server that points to the Puggernaut HTTP server.
+Set up a URL on your public facing web server that points to the Puggernaut HTTP server (long poll).
 
-If you do not see your web server below, [Google](http://google.com) is your friend.
+We all use Nginx, right?
 
-### Apache
-
-*http.conf*
+### nginx.conf
 
 <pre>
-ProxyPass /long_poll http://localhost:8100/
-ProxyPassReverse /long_poll http://localhost:8100/
-</pre>
-
-### Nginx
-
-*nginx.conf*
-
-<pre>
-location /long_poll {
-  proxy_pass http://localhost:8100/;
+server {
+	location /long_poll {
+	  proxy_pass http://localhost:8100/;
+	}
 }
 </pre>
 
@@ -79,7 +71,8 @@ Include [jQuery](http://jquery.com) and [puggernaut.js](https://github.com/winto
 Javascript client example:
 
 <pre>
-Puggernaut.path = '/long_poll'; // (default)
+Puggernaut.path = '/long_poll'; // (default long poll path)
+Puggernaut.port = 8102; 		// (default WebSocket port)
 
 Puggernaut
   .watch('channel', function(e, message) {
@@ -99,7 +92,7 @@ Specs are a work in progress, though we can vouch for some of the functionality
 
 Set up Nginx to point to a cloned copy of this project:
 
-*nginx.conf*
+### nginx.conf
 
 <pre>
 server {

data/config/gemsets.yml

@@ -1,6 +1,7 @@
 puggernaut:
   em-websocket: ~>0.2.1
   eventmachine: ~>0.12.10
+  memprof: ~>0.3.10
   rake: >=0.8.7
   rspec: ~>1.0
   sinatra: ~>1.1.0

data/config/gemspec.yml

@@ -1,5 +1,5 @@
 name: puggernaut
-version: 0.2.0
+version: 0.2.1
 authors:
   - Winton Welsh
 email: mail@wintoni.us
@@ -9,4 +9,5 @@ description: Simple server push implementation using eventmachine and long polli
 dependencies:
   - em-websocket
   - eventmachine
+  - memprof
 development_dependencies: null

data/lib/puggernaut.rb

@@ -4,6 +4,7 @@ Puggernaut::Gems.activate %w(eventmachine em-websocket)
 
 require 'eventmachine'
 require 'em-websocket'
+require 'memprof'
 
 $:.unshift File.dirname(__FILE__)
 

data/lib/puggernaut/server.rb

@@ -14,8 +14,8 @@ module Puggernaut
       puts "*snort*\n\n"
 
       begin
+        Memprof.start
         Channel.channels = []
-        GC.start
         EM.epoll if EM.epoll?
         EM.run do
           logger.info "Server#initialize - Starting HTTP - #{http_port}"
@@ -29,6 +29,8 @@ module Puggernaut
           
           errors = 0
         end
+        Memprof.stats(Dir.pwd + '/log/puggernaut.mem.log')
+        Memprof.stop
       rescue Interrupt
         logger.info "Server#initialize - Shutting down"
         exit

data/lib/puggernaut/server/http.rb

@@ -21,6 +21,8 @@ module Puggernaut
           logger.info "Server::Http#receive_data - Request - #{path} - #{query}"
           query = CGI.parse(query) if not query.nil?
         end
+        
+        puts path
 
         if path == '/'
           channels, @join_leave, lasts, time, user_id = query_defaults(query)

data/public/puggernaut.js

@@ -4,13 +4,14 @@ var Puggernaut = new function() {
 	var self = this;
 	
 	this.disabled = false;
+	this.host = window.location.host;
 	this.path = '/long_poll';
+	this.port = 8102;
 	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;
@@ -19,7 +20,6 @@ var Puggernaut = new function() {
 	var started = false;
 	var request;
 	var request_id;
-	var port = 8102;
 
 	function ajax(join_leave, time, user_id) {
 		if (channelLength() > 0 && !self.disabled && errors <= 10) {
@@ -190,7 +190,7 @@ var Puggernaut = new function() {
 	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 = new WebSocket("ws://" + self.host + ":" + self.port + "/");
 			request.onopen = function() {
 				errors = 0;
 				if (started)
@@ -216,9 +216,4 @@ var Puggernaut = new function() {
 			};
 		}
 	}
-	
-	function webSocketPort(p) {
-		if (p) port = p;
-		return port;
-	}
 };

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: puggernaut
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Winton Welsh
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-15 00:00:00 -07:00
+date: 2011-04-29 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,6 +50,22 @@ dependencies:
         version: 0.12.10
   type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: memprof
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 0
+        - 3
+        - 10
+        version: 0.3.10
+  type: :runtime
+  version_requirements: *id003
 description: Simple server push implementation using eventmachine and long polling
 email: mail@wintoni.us
 executables: