faye 0.1.1 → 0.2.2

data/examples/rack/app.rb

@@ -0,0 +1,6 @@
+require 'sinatra'
+PUBLIC_DIR = File.dirname(__FILE__) + '/../shared/public'
+set :public, PUBLIC_DIR
+
+get('/') { File.read(PUBLIC_DIR + '/index.html') }
+

data/examples/{soapbox → rack}/config.ru

@@ -3,6 +3,6 @@ dir = File.dirname(__FILE__)
 require dir + '/../../lib/faye'
 require dir + '/app'
 
-use Faye::RackAdapter, :mount => '/comet'
+use Faye::RackAdapter, :mount => '/comet', :timeout => 25
 run Sinatra::Application
 

data/jake.yml

@@ -1,19 +1,34 @@
 ---
-source_directory:   client
-build_directory:    lib
+source_directory:   javascript
+build_directory:    build
 builds:
+  src:
+    packer:         false
+    suffix:         false
   min:
     shrink_vars:    true
     private:        true
 packages:
-  faye:
+  core:
     - faye
     - util/class
-    - util/event
-    - util/uri
-    - util/xhr
+    - util/observable
     - channel
-    - transport
-    - client
-    - util/json
+  faye:
+    extends: core
+    files:
+      - util/set
+      - server
+      - connection
+      - error
+      - node_adapter
+  faye-client:
+    extends: core
+    files:
+      - util/event
+      - util/uri
+      - util/xhr
+      - transport
+      - client
+      - util/json
 

data/lib/faye-client-min.js

@@ -0,0 +1 @@
+if(!this.Faye)Faye={};Faye.extend=function(a,b,c){if(!b)return a;for(var d in b){if(b.hasOwnProperty(d)&&a[d]!==b[d]){if(!a.hasOwnProperty(d)||c!==false)a[d]=b[d]}}return a};Faye.extend(Faye,{BAYEUX_VERSION:'1.0',VERSION:'0.2.2',JSONP_CALLBACK:'jsonpcallback',ID_LENGTH:128,CONNECTION_TYPES:["long-polling","callback-polling"],ENV:this,Grammar:{LOWALPHA:/^[a-z]$/,UPALPHA:/^[A-Z]$/,ALPHA:/^([a-z]|[A-Z])$/,DIGIT:/^[0-9]$/,ALPHANUM:/^(([a-z]|[A-Z])|[0-9])$/,MARK:/^(\-|\_|\!|\~|\(|\)|\$|\@)$/,STRING:/^(((([a-z]|[A-Z])|[0-9])|(\-|\_|\!|\~|\(|\)|\$|\@)| |\/|\*|\.))*$/,TOKEN:/^(((([a-z]|[A-Z])|[0-9])|(\-|\_|\!|\~|\(|\)|\$|\@)))+$/,INTEGER:/^([0-9])+$/,CHANNEL_SEGMENT:/^(((([a-z]|[A-Z])|[0-9])|(\-|\_|\!|\~|\(|\)|\$|\@)))+$/,CHANNEL_SEGMENTS:/^(((([a-z]|[A-Z])|[0-9])|(\-|\_|\!|\~|\(|\)|\$|\@)))+(\/(((([a-z]|[A-Z])|[0-9])|(\-|\_|\!|\~|\(|\)|\$|\@)))+)*$/,CHANNEL_NAME:/^\/(((([a-z]|[A-Z])|[0-9])|(\-|\_|\!|\~|\(|\)|\$|\@)))+(\/(((([a-z]|[A-Z])|[0-9])|(\-|\_|\!|\~|\(|\)|\$|\@)))+)*$/,WILD_CARD:/^\*{1,2}$/,CHANNEL_PATTERN:/^(\/(((([a-z]|[A-Z])|[0-9])|(\-|\_|\!|\~|\(|\)|\$|\@)))+)*\/\*{1,2}$/,VERSION_ELEMENT:/^(([a-z]|[A-Z])|[0-9])(((([a-z]|[A-Z])|[0-9])|\-|\_))*$/,VERSION:/^([0-9])+(\.(([a-z]|[A-Z])|[0-9])(((([a-z]|[A-Z])|[0-9])|\-|\_))*)*$/,CLIENT_ID:/^((([a-z]|[A-Z])|[0-9]))+$/,ID:/^((([a-z]|[A-Z])|[0-9]))+$/,ERROR_MESSAGE:/^(((([a-z]|[A-Z])|[0-9])|(\-|\_|\!|\~|\(|\)|\$|\@)| |\/|\*|\.))*$/,ERROR_ARGS:/^(((([a-z]|[A-Z])|[0-9])|(\-|\_|\!|\~|\(|\)|\$|\@)| |\/|\*|\.))*(,(((([a-z]|[A-Z])|[0-9])|(\-|\_|\!|\~|\(|\)|\$|\@)| |\/|\*|\.))*)*$/,ERROR_CODE:/^[0-9][0-9][0-9]$/,ERROR:/^([0-9][0-9][0-9]:(((([a-z]|[A-Z])|[0-9])|(\-|\_|\!|\~|\(|\)|\$|\@)| |\/|\*|\.))*(,(((([a-z]|[A-Z])|[0-9])|(\-|\_|\!|\~|\(|\)|\$|\@)| |\/|\*|\.))*)*:(((([a-z]|[A-Z])|[0-9])|(\-|\_|\!|\~|\(|\)|\$|\@)| |\/|\*|\.))*|[0-9][0-9][0-9]::(((([a-z]|[A-Z])|[0-9])|(\-|\_|\!|\~|\(|\)|\$|\@)| |\/|\*|\.))*)$/},commonElement:function(a,b){for(var c=0,d=a.length;c<d;c++){if(this.indexOf(b,a[c])!==-1)return a[c]}return null},indexOf:function(a,b){for(var c=0,d=a.length;c<d;c++){if(a[c]===b)return c}return-1},each:function(a,b,c){if(a instanceof Array){for(var d=0,f=a.length;d<f;d++){if(a[d]!==undefined)b.call(c||null,a[d],d)}}else{for(var g in a){if(a.hasOwnProperty(g))b.call(c||null,g,a[g])}}},size:function(a){var b=0;this.each(a,function(){b+=1});return b},random:function(){var a=Math.pow(2,this.ID_LENGTH);return(Math.random()*a).toString(16).replace(/0*$/,'')},enumEqual:function(c,d){if(d instanceof Array){if(!(c instanceof Array))return false;var f=c.length;if(f!==d.length)return false;while(f--){if(c[f]!==d[f])return false}return true}else{if(!(c instanceof Object))return false;if(this.size(d)!==this.size(c))return false;var g=true;this.each(c,function(a,b){g=g&&(d[a]===b)});return g}}});Faye.Class=function(a,b){if(typeof a!=='function'){b=a;a=Object}var c=function(){if(!this.initialize)return this;return this.initialize.apply(this,arguments)||this};var d=function(){};d.prototype=a.prototype;c.prototype=new d();Faye.extend(c.prototype,b);return c};Faye.Observable={on:function(a,b,c){this._1=this._1||{};var d=this._1[a]=this._1[a]||[];d.push([b,c])},stopObserving:function(a,b,c){if(!this._1||!this._1[a])return;if(!b){delete this._1[a];return}var d=this._1[a],f=d.length;while(f--){if(b&&d[f][0]!==b)continue;if(c&&d[f][1]!==c)continue;d.splice(f,1)}},fire:function(){var b=Array.prototype.slice.call(arguments),c=b.shift();if(!this._1||!this._1[c])return;Faye.each(this._1[c],function(a){a[0].apply(a[1],b.slice())})}};Faye.Channel=Faye.Class({initialize:function(a){this.__id=this._A=a},push:function(a){this.fire('message',a)}});Faye.extend(Faye.Channel.prototype,Faye.Observable);Faye.extend(Faye.Channel,{HANDSHAKE:'/meta/handshake',CONNECT:'/meta/connect',SUBSCRIBE:'/meta/subscribe',UNSUBSCRIBE:'/meta/unsubscribe',DISCONNECT:'/meta/disconnect',META:'meta',SERVICE:'service',isValid:function(a){return Faye.Grammar.CHANNEL_NAME.test(a)||Faye.Grammar.CHANNEL_PATTERN.test(a)},parse:function(a){if(!this.isValid(a))return null;return a.split('/').slice(1)},isMeta:function(a){var b=this.parse(a);return b?(b[0]===this.META):null},isService:function(a){var b=this.parse(a);return b?(b[0]===this.SERVICE):null},isSubscribable:function(a){if(!this.isValid(a))return null;return!this.isMeta(a)&&!this.isService(a)},Tree:Faye.Class({initialize:function(a){this._3=a;this._5={}},eachChild:function(c,d){Faye.each(this._5,function(a,b){c.call(d,a,b)})},each:function(c,d,f){this.eachChild(function(a,b){a=c.concat(a);b.each(a,d,f)});if(this._3!==undefined)d.call(f,c,this._3)},map:function(c,d){var f=[];this.each([],function(a,b){f.push(c.call(d,a,b))});return f},get:function(a){var b=this.traverse(a);return b?b._3:null},set:function(a,b){var c=this.traverse(a,true);if(c)c._3=b},traverse:function(a,b){if(typeof a==='string')a=Faye.Channel.parse(a);if(a===null)return null;if(a.length===0)return this;var c=this._5[a[0]];if(!c&&!b)return null;if(!c)c=this._5[a[0]]=new Faye.Channel.Tree();return c.traverse(a.slice(1),b)},findOrCreate:function(a){var b=this.get(a);if(b)return b;b=new Faye.Channel(a);this.set(a,b);return b},glob:function(f){if(typeof f==='string')f=Faye.Channel.parse(f);if(f===null)return[];if(f.length===0)return(this._3===undefined)?[]:[this._3];var g=[];if(Faye.enumEqual(f,['*'])){Faye.each(this._5,function(a,b){if(b._3!==undefined)g.push(b._3)});return g}if(Faye.enumEqual(f,['**'])){g=this.map(function(a,b){return b});g.pop();return g}Faye.each(this._5,function(b,c){if(b!==f[0]&&b!=='*')return;var d=c.glob(f.slice(1));Faye.each(d,function(a){g.push(a)})});if(this._5['**'])g.push(this._5['**']._3);return g}})});Faye.Event={_a:[],on:function(a,b,c,d){var f=function(){c.call(d)};if(a.addEventListener)a.addEventListener(b,f,false);else a.attachEvent('on'+b,f);this._a.push({_b:a,_h:b,_s:c,_c:d,_m:f})},detach:function(a,b,c,d){var f=this._a.length,g;while(f--){g=this._a[f];if((a&&a!==g._b)||(b&&b!==g._h)||(c&&c!==g._s)||(d&&d!==g._c))continue;if(g._b.removeEventListener)g._b.removeEventListener(g._h,g._m,false);else g._b.detachEvent('on'+g._h,g._m);this._a.splice(f,1);g=null}}};Faye.Event.on(Faye.ENV,'unload',Faye.Event.detach,Faye.Event);Faye.URI=Faye.extend(Faye.Class({queryString:function(){var c=[],d;Faye.each(this.params,function(a,b){c.push(encodeURIComponent(a)+'='+encodeURIComponent(b))});return c.join('&')},isLocal:function(){var a=Faye.URI.parse(Faye.ENV.location.href);var b=(a.hostname!==this.hostname)||(a.port!==this.port)||(a.protocol!==this.protocol);return!b},toURL:function(){return this.protocol+this.hostname+':'+this.port+this.pathname+'?'+this.queryString()}}),{parse:function(d,f){if(typeof d!=='string')return d;var g=new this();var k=function(b,c){d=d.replace(c,function(a){if(a)g[b]=a;return''})};k('protocol',/^https?\:\/+/);k('hostname',/^[^\/\:]+/);k('port',/^:[0-9]+/);Faye.extend(g,{protocol:'http://',hostname:Faye.ENV.location.hostname,port:Faye.ENV.location.port},false);if(!g.port)g.port=(g.protocol==='https://')?'443':'80';g.port=g.port.replace(/\D/g,'');var i=d.split('?'),h=i.shift(),l=i.join('?'),n=l?l.split('&'):[],o=n.length,j={};while(o--){i=n[o].split('=');j[decodeURIComponent(i[0]||'')]=decodeURIComponent(i[1]||'')}Faye.extend(j,f);g.pathname=h;g.params=j;return g}});Faye.XHR={request:function(a,b,c,d,f){var g=new this.Request(a,b,c,d,f);g.send();return g},getXhrObject:function(){return Faye.ENV.ActiveXObject?new ActiveXObject("Microsoft.XMLHTTP"):new XMLHttpRequest()},Request:Faye.Class({initialize:function(a,b,c,d,f){this._d=a.toUpperCase();this._6=Faye.URI.parse(b,c);this._t=(typeof d==='function')?{success:d}:d;this._c=f||null;this._2=null},send:function(){if(this._i)return;var a=this._6.pathname,b=this._6.queryString();if(this._d==='GET')a+='?'+b;var c=this._d==='POST'?b:'';this._i=true;this._2=Faye.XHR.getXhrObject();this._2.open(this._d,a,true);if(this._d==='POST')this._2.setRequestHeader('Content-Type','application/x-www-form-urlencoded');var d=this,f=function(){if(d._2.readyState!==4)return;if(g){clearInterval(g);g=null}Faye.Event.detach(Faye.ENV,'beforeunload',d.abort,d);d._i=false;d._u();d=null};var g=setInterval(f,10);Faye.Event.on(Faye.ENV,'beforeunload',this.abort,this);this._2.send(c)},abort:function(){this._2.abort()},_u:function(){var a=this._t;if(!a)return;return this.success()?a.success&&a.success.call(this._c,this):a.failure&&a.failure.call(this._c,this)},waiting:function(){return!!this._i},complete:function(){return this._2&&!this.waiting()},success:function(){if(!this.complete())return false;var a=this._2.status;return(a>=200&&a<300)||a===304||a===1223},failure:function(){if(!this.complete())return false;return!this.success()},text:function(){if(!this.complete())return null;return this._2.responseText},status:function(){if(!this.complete())return null;return this._2.status}})};Faye.Transport=Faye.extend(Faye.Class({initialize:function(a,b){this._n=a;this._6=b},send:function(c,d,f){c={message:JSON.stringify(c)};return this.request(c,function(b){if(!d)return;Faye.each([].concat(b),function(a){d.call(f,a);if(a.advice)this._n._v(a.advice);if(a.data&&a.channel)this._n._w(a)},this)},this)}}),{get:function(a,b){var c=a._6;if(b===undefined)b=this.supportedConnectionTypes();var d=Faye.URI.parse(c).isLocal()?['long-polling','callback-polling']:['callback-polling'];var f=Faye.commonElement(d,b);if(!f)throw'Could not find a usable connection type for '+c;var g=this._j[f];return new g(a,c)},register:function(a,b){this._j[a]=b;b.prototype.connectionType=a},_j:{},supportedConnectionTypes:function(){var c=[],d;Faye.each(this._j,function(a,b){c.push(a)});return c}});Faye.XHRTransport=Faye.Class(Faye.Transport,{request:function(b,c,d){Faye.XHR.request('post',this._6,b,function(a){if(c)c.call(d,JSON.parse(a.text()))})}});Faye.Transport.register('long-polling',Faye.XHRTransport);Faye.JSONPTransport=Faye.extend(Faye.Class(Faye.Transport,{request:function(b,c,d){var f=document.getElementsByTagName('head')[0],g=document.createElement('script'),k=Faye.JSONPTransport.getCallbackName(),i=Faye.URI.parse(this._6,b);Faye.ENV[k]=function(a){Faye.ENV[k]=undefined;try{delete Faye.ENV[k]}catch(e){}f.removeChild(g);if(c)c.call(d,a)};i.params.jsonp=k;g.type='text/javascript';g.src=i.toURL();f.appendChild(g)}}),{_o:0,getCallbackName:function(){this._o+=1;return'__jsonp'+this._o+'__'}});Faye.Transport.register('callback-polling',Faye.JSONPTransport);Faye.Client=Faye.Class({_e:{},_x:{},_8:{},_y:{},_p:'handshake',_z:'retry',_q:'none',DEFAULT_ENDPOINT:'/bayeux',MAX_DELAY:0.1,INTERVAL:1000.0,initialize:function(a){this._6=a||this.DEFAULT_ENDPOINT;this._4=Faye.Transport.get(this);this._0=this._e;this._k=[];this._f=new Faye.Channel.Tree();this._7={reconnect:this._z,interval:this.INTERVAL};Faye.Event.on(Faye.ENV,'beforeunload',this.disconnect,this)},handshake:function(b,c){if(this._7.reconnect===this._q)return;if(this._0!==this._e)return;this._0=this._x;var d=this,f=this.generateId();this._4.send({channel:Faye.Channel.HANDSHAKE,version:Faye.BAYEUX_VERSION,supportedConnectionTypes:Faye.Transport.supportedConnectionTypes(),id:f},function(a){if(a.id!==f)return;if(!a.successful){setTimeout(function(){d.handshake(b,c)},this._7.interval);return this._0=this._e}this._0=this._8;this._9=a.clientId;this._4=Faye.Transport.get(this,a.supportedConnectionTypes);if(b)b.call(c)},this)},connect:function(b,c){if(this._7.reconnect===this._q)return;if(this._7.reconnect===this._p||this._0===this._e)return this.handshake(function(){this.connect(b,c)},this);if(this._0!==this._8)return;if(this._g)return;this._g=this.generateId();var d=this;this._4.send({channel:Faye.Channel.CONNECT,clientId:this._9,connectionType:this._4.connectionType,id:this._g},function(a){if(a.id!==this._g)return;delete this._g;if(a.successful)this.connect();else setTimeout(function(){d.connect()},this._7.interval)},this);if(b)b.call(c)},disconnect:function(){if(this._0!==this._8)return;this._0=this._y;this._4.send({channel:Faye.Channel.DISCONNECT,clientId:this._9});this._f=new Faye.Channel.Tree()},subscribe:function(c,d,f){if(this._0!==this._8)return;c=[].concat(c);this._l(c);var g=this.generateId();this._4.send({channel:Faye.Channel.SUBSCRIBE,clientId:this._9,subscription:c,id:g},function(b){if(b.id!==g)return;if(!b.successful)return;c=[].concat(b.subscription);Faye.each(c,function(a){this._f.set(a,[d,f])},this)},this)},unsubscribe:function(c,d,f){if(this._0!==this._8)return;c=[].concat(c);this._l(c);var g=this.generateId();this._4.send({channel:Faye.Channel.UNSUBSCRIBE,clientId:this._9,subscription:c,id:g},function(b){if(b.id!==g)return;if(!b.successful)return;c=[].concat(b.subscription);Faye.each(c,function(a){this._f.set(a,null)},this)},this)},publish:function(a,b){if(this._0!==this._8)return;this._l([a]);this.enqueue({channel:a,data:b,clientId:this._9});if(this._r)return;var c=this;this._r=setTimeout(function(){delete c._r;c.flush()},this.MAX_DELAY*1000)},generateId:function(a){a=a||32;return Math.floor(Math.pow(2,a)*Math.random()).toString(16)},enqueue:function(a){this._k.push(a)},flush:function(){this._4.send(this._k);this._k=[]},_l:function(b){Faye.each(b,function(a){if(!Faye.Channel.isValid(a))throw'"'+a+'" is not a valid channel name';if(!Faye.Channel.isSubscribable(a))throw'Clients may not subscribe to channel "'+a+'"';})},_v:function(a){Faye.extend(this._7,a);if(this._7.reconnect===this._p)this._9=null},_w:function(b){var c=this._f.glob(b.channel);Faye.each(c,function(a){if(!a)return;a[0].call(a[1],b.data)})}});if(!this.JSON){JSON={}}(function(){function l(a){return a<10?'0'+a:a}if(typeof Date.prototype.toJSON!=='function'){Date.prototype.toJSON=function(a){return this.getUTCFullYear()+'-'+l(this.getUTCMonth()+1)+'-'+l(this.getUTCDate())+'T'+l(this.getUTCHours())+':'+l(this.getUTCMinutes())+':'+l(this.getUTCSeconds())+'Z'};String.prototype.toJSON=Number.prototype.toJSON=Boolean.prototype.toJSON=function(a){return this.valueOf()}}var n=/[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,o=/[\\\"\x00-\x1f\x7f-\x9f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,j,p,s={'\b':'\\b','\t':'\\t','\n':'\\n','\f':'\\f','\r':'\\r','"':'\\"','\\':'\\\\'},m;function r(c){o.lastIndex=0;return o.test(c)?'"'+c.replace(o,function(a){var b=s[a];return typeof b==='string'?b:'\\u'+('0000'+a.charCodeAt(0).toString(16)).slice(-4)})+'"':'"'+c+'"'}function q(a,b){var c,d,f,g,k=j,i,h=b[a];if(h&&typeof h==='object'&&typeof h.toJSON==='function'){h=h.toJSON(a)}if(typeof m==='function'){h=m.call(b,a,h)}switch(typeof h){case'string':return r(h);case'number':return isFinite(h)?String(h):'null';case'boolean':case'null':return String(h);case'object':if(!h){return'null'}j+=p;i=[];if(Object.prototype.toString.apply(h)==='[object Array]'){g=h.length;for(c=0;c<g;c+=1){i[c]=q(c,h)||'null'}f=i.length===0?'[]':j?'[\n'+j+i.join(',\n'+j)+'\n'+k+']':'['+i.join(',')+']';j=k;return f}if(m&&typeof m==='object'){g=m.length;for(c=0;c<g;c+=1){d=m[c];if(typeof d==='string'){f=q(d,h);if(f){i.push(r(d)+(j?': ':':')+f)}}}}else{for(d in h){if(Object.hasOwnProperty.call(h,d)){f=q(d,h);if(f){i.push(r(d)+(j?': ':':')+f)}}}}f=i.length===0?'{}':j?'{\n'+j+i.join(',\n'+j)+'\n'+k+'}':'{'+i.join(',')+'}';j=k;return f}}if(typeof JSON.stringify!=='function'){JSON.stringify=function(a,b,c){var d;j='';p='';if(typeof c==='number'){for(d=0;d<c;d+=1){p+=' '}}else if(typeof c==='string'){p=c}m=b;if(b&&typeof b!=='function'&&(typeof b!=='object'||typeof b.length!=='number')){throw new Error('JSON.stringify');}return q('',{'':a})}}if(typeof JSON.parse!=='function'){JSON.parse=function(g,k){var i;function h(a,b){var c,d,f=a[b];if(f&&typeof f==='object'){for(c in f){if(Object.hasOwnProperty.call(f,c)){d=h(f,c);if(d!==undefined){f[c]=d}else{delete f[c]}}}}return k.call(a,b,f)}n.lastIndex=0;if(n.test(g)){g=g.replace(n,function(a){return'\\u'+('0000'+a.charCodeAt(0).toString(16)).slice(-4)})}if(/^[\],:{}\s]*$/.test(g.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,'@').replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,']').replace(/(?:^|:|,)(?:\s*\[)+/g,''))){i=eval('('+g+')');return typeof k==='function'?h({'':i},''):i}throw new SyntaxError('JSON.parse');}}}());

data/lib/faye.rb

@@ -5,10 +5,10 @@ require 'rubygems'
 require 'eventmachine'
 
 module Faye
-  VERSION = '0.1.1'
+  VERSION = '0.2.2'
   
   ROOT = File.expand_path(File.dirname(__FILE__))
-  CLIENT_SCRIPT = File.join(ROOT, 'faye-min.js')
+  CLIENT_SCRIPT = File.join(ROOT, 'faye-client-min.js')
   
   BAYEUX_VERSION   = '1.0'
   ID_LENGTH        = 128

data/lib/faye/rack_adapter.rb

@@ -4,6 +4,10 @@ require 'json'
 
 module Faye
   class RackAdapter
+    
+    # Only supported under Thin
+    ASYNC_RESPONSE = [-1, {}, []].freeze
+    
     DEFAULT_ENDPOINT  = '/bayeux'
     
     TYPE_JSON   = {'Content-Type' => 'text/json'}
@@ -24,19 +28,20 @@ module Faye
       case request.path_info
       
       when @endpoint then
-        message  = JSON.parse(request.params['message'])
-        jsonp    = request.params['jsonp'] || JSONP_CALLBACK
-        type     = request.get? ? TYPE_SCRIPT : TYPE_JSON
-        response = nil
-        
-        @server.process(message, false) do |replies|
-          response = JSON.unparse(replies)
-          response = "#{ jsonp }(#{ response });" if request.get?
+        begin
+          message  = JSON.parse(request.params['message'])
+          jsonp    = request.params['jsonp'] || JSONP_CALLBACK
+          
+          @server.flush_connection(message) if request.get?
+          
+          on_response(env, message) do |replies|
+            response = JSON.unparse(replies)
+            response = "#{ jsonp }(#{ response });" if request.get?
+            response
+          end
+        rescue
+          [400, {'Content-Type' => 'text/plain'}, 'Bad request']
         end
-        
-        # TODO support Thin's async responses
-        sleep(0.1) while response.nil?
-        [200, type, [response]]
       
       when @script then
         [200, TYPE_SCRIPT, File.new(CLIENT_SCRIPT)]
@@ -48,6 +53,33 @@ module Faye
       end
     end
     
+  private
+    
+    def on_response(env, message, &block)
+      request  = Rack::Request.new(env)
+      type     = request.get? ? TYPE_SCRIPT : TYPE_JSON
+      callback = env['async.callback']
+      
+      EM.run unless EM.reactor_running?
+      
+      if callback
+        body = DeferredBody.new
+        callback.call [200, type, body]
+        @server.process(message, false) { |r| body.succeed block.call(r) }
+        return ASYNC_RESPONSE
+      end
+      
+      response = nil
+      @server.process(message, false) { |r| response = block.call(r) }
+      sleep(0.1) while response.nil?
+      [200, type, [response]]
+    end
+    
+    class DeferredBody
+      include EventMachine::Deferrable
+      alias :each :callback
+    end
+    
   end
 end
 

data/lib/faye/server.rb

@@ -4,7 +4,16 @@ module Faye
       @options  = options
       @channels = Channel::Tree.new
       @clients  = {}
-      Thread.new { EventMachine.run } unless EventMachine.reactor_running?
+    end
+    
+    # Notifies the server of stale connections that should be deleted
+    def update(message, client)
+      return unless message == :stale_client
+      destroy_client(client)
+    end
+    
+    def client_ids
+      @clients.keys
     end
     
     def process(messages, local = false, &callback)
@@ -21,6 +30,34 @@ module Faye
       end
     end
     
+    def flush_connection(messages)
+      [messages].flatten.each do |message|
+        client = @clients[message['clientId']]
+        client.flush! if client
+      end
+    end
+    
+  private
+    
+    def generate_id
+      id = Faye.random
+      id = Faye.random while @clients.has_key?(id)
+      connection(id).id
+    end
+    
+    def connection(id)
+      return @clients[id] if @clients.has_key?(id)
+      client = Connection.new(id, @options)
+      client.add_observer(self)
+      @clients[id] = client
+    end
+    
+    def destroy_client(client)
+      client.disconnect!
+      client.delete_observer(self)
+      @clients.delete(client.id)
+    end
+    
     def handle(message, local = false, &callback)
       client_id = message['clientId']
       channel   = message['channel']
@@ -196,36 +233,6 @@ module Faye
       response
     end
     
-    # Notifies the server of stale connections that should be deleted
-    def update(message, client)
-      return unless message == :stale_client
-      destroy_client(client)
-    end
-    
-    def client_ids
-      @clients.keys
-    end
-    
-  private
-    
-    def generate_id
-      id = Faye.random
-      id = Faye.random while @clients.has_key?(id)
-      connection(id).id
-    end
-    
-    def connection(id)
-      return @clients[id] if @clients.has_key?(id)
-      client = Connection.new(id, @options)
-      client.add_observer(self)
-      @clients[id] = client
-    end
-    
-    def destroy_client(client)
-      client.disconnect!
-      client.delete_observer(self)
-      @clients.delete(client.id)
-    end
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: faye
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - James Coglan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-26 00:00:00 +01:00
+date: 2010-02-11 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,6 +42,26 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: rubyforge
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.0.3
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: gemcutter
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.3.0
+    version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
   type: :development
@@ -50,7 +70,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.0.0
+        version: 2.5.0
     version: 
 description: ""
 email: 
@@ -63,6 +83,7 @@ extra_rdoc_files:
 - History.txt
 - Manifest.txt
 - README.txt
+- examples/shared/public/robots.txt
 files: 
 - History.txt
 - Manifest.txt
@@ -70,16 +91,21 @@ files:
 - Rakefile
 - jake.yml
 - Jakefile
-- client/util/class.js
-- client/util/event.js
-- client/util/json.js
-- client/util/uri.js
-- client/util/xhr.js
-- client/faye.js
-- client/transport.js
-- client/client.js
-- client/channel.js
-- lib/faye-min.js
+- build/faye.js
+- build/faye-client-min.js
+- examples/README.rdoc
+- examples/shared/public/index.html
+- examples/shared/public/favicon.ico
+- examples/shared/public/jquery.js
+- examples/shared/public/robots.txt
+- examples/shared/public/soapbox.js
+- examples/shared/public/style.css
+- examples/node/app.js
+- examples/node/faye.js
+- examples/node/faye-client-min.js
+- examples/rack/app.rb
+- examples/rack/config.ru
+- lib/faye-client-min.js
 - lib/faye.rb
 - lib/faye/channel.rb
 - lib/faye/connection.rb
@@ -87,18 +113,13 @@ files:
 - lib/faye/grammar.rb
 - lib/faye/rack_adapter.rb
 - lib/faye/server.rb
-- examples/soapbox/README
-- examples/soapbox/app.rb
-- examples/soapbox/config.ru
-- examples/soapbox/public/jquery.js
-- examples/soapbox/public/soapbox.js
-- examples/soapbox/public/style.css
-- examples/soapbox/views/index.erb
 - test/test_channel.rb
 - test/test_grammar.rb
 - test/test_server.rb
 has_rdoc: true
 homepage: http://github.com/jcoglan/faye
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
@@ -120,11 +141,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: faye
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: ""
 test_files: 
+- test/test_grammar.rb
 - test/test_server.rb
 - test/test_channel.rb
-- test/test_grammar.rb

data/client/channel.js

@@ -1,135 +0,0 @@
-Faye.Channel = {
-  HANDSHAKE:    '<%= Faye::Channel::HANDSHAKE %>',
-  CONNECT:      '<%= Faye::Channel::CONNECT %>',
-  SUBSCRIBE:    '<%= Faye::Channel::SUBSCRIBE %>',
-  UNSUBSCRIBE:  '<%= Faye::Channel::UNSUBSCRIBE %>',
-  DISCONNECT:   '<%= Faye::Channel::DISCONNECT %>',
-  
-  META:         '<%= Faye::Channel::META %>',
-  SERVICE:      '<%= Faye::Channel::SERVICE %>',
-  
-  isValid: function(name) {
-    return Faye.Grammar.CHANNEL_NAME.test(name) ||
-           Faye.Grammar.CHANNEL_PATTERN.test(name);
-  },
-  
-  parse: function(name) {
-    if (!this.isValid(name)) return null;
-    return name.split('/').slice(1);
-  },
-  
-  isMeta: function(name) {
-    var segments = this.parse(name);
-    return segments ? (segments[0] === this.META) : null;
-  },
-  
-  isService: function(name) {
-    var segments = this.parse(name);
-    return segments ? (segments[0] === this.SERVICE) : null;
-  },
-  
-  isSubscribable: function(name) {
-    if (!this.isValid(name)) return null;
-    return !this.isMeta(name) && !this.isService(name);
-  },
-  
-  Tree: Faye.Class({
-    initialize: function(value) {
-      this._value = value;
-      this._children = {};
-    },
-    
-    eachChild: function(block, context) {
-      Faye.each(this._children, function(key, subtree) {
-        block.call(context, key, subtree);
-      });
-    },
-    
-    each: function(prefix, block, context) {
-      this.eachChild(function(path, subtree) {
-        path = prefix.concat(path);
-        subtree.each(path, block, context);
-      });
-      if (this._value !== undefined) block.call(context, prefix, this._value);
-    },
-    
-    map: function(block, context) {
-      var result = [];
-      this.each([], function(path, value) {
-        result.push(block.call(context, path, value));
-      });
-      return result;
-    },
-    
-    get: function(name) {
-      var tree = this.traverse(name);
-      return tree ? tree._value : null;
-    },
-    
-    set: function(name, value) {
-      var subtree = this.traverse(name, true);
-      if (subtree) subtree._value = value;
-    },
-    
-    traverse: function(path, createIfAbsent) {
-      if (typeof path === 'string') path = Faye.Channel.parse(path);
-      
-      if (path === null) return null;
-      if (path.length === 0) return this;
-      
-      var subtree = this._children[path[0]];
-      if (!subtree && !createIfAbsent) return null;
-      if (!subtree) subtree = this._children[path[0]] = new Faye.Channel.Tree();
-      
-      return subtree.traverse(path.slice(1), createIfAbsent);
-    },
-    
-    glob: function(path) {
-      if (typeof path === 'string') path = Faye.Channel.parse(path);
-      
-      if (path === null) return [];
-      if (path.length === 0) return (this._value === undefined) ? [] : [this._value];
-      
-      var list = [];
-      
-      if (Faye.enumEqual(path, ['*'])) {
-        Faye.each(this._children, function(key, subtree) {
-          if (subtree._value !== undefined) list.push(subtree._value);
-        });
-        return list;
-      }
-      
-      if (Faye.enumEqual(path, ['**'])) {
-        list = this.map(function(key, value) { return value });
-        list.pop();
-        return list;
-      }
-      
-      Faye.each(this._children, function(key, subtree) {
-        if (key !== path[0] && key !== '*') return;
-        var sublist = subtree.glob(path.slice(1));
-        Faye.each(sublist, function(channel) { list.push(channel) });
-      });
-      
-      if (this._children['**']) list.push(this._children['**']._value);
-      return list;
-    }
-    
-    /**
-      Tests
-      
-      glob = new Faye.Channel.Tree();
-      list = '/foo/bar /foo/boo /foo /foobar /foo/bar/boo /foobar/boo /foo/* /foo/**'.split(' ');
-
-      Faye.each(list, function(c, i) {
-          glob.set(c, i + 1);
-      });
-
-      console.log(glob.glob('/foo/*').sort());        // 1,2,7,8
-      console.log(glob.glob('/foo/bar').sort());      // 1,7,8
-      console.log(glob.glob('/foo/**').sort());       // 1,2,5,7,8
-      console.log(glob.glob('/foo/bar/boo').sort());  // 5,8
-    **/
-  })
-};
-