dripdrop 0.10.0 → 0.11.0

data/README.md

@@ -32,7 +32,7 @@ Let's start by looking at the normalized communication interface in a simple app
         route :my_client, :http_client, 'http://127.0.0.1:2201'
         
         # Our http server is a simple time server
-        my_server.on_recv do |message,response|
+        my_server.on_receive do |message,response|
           response.send_message(:name => 'time', :body => {'time' => Time.now.to_s})
         end
         
@@ -57,7 +57,7 @@ What we've done here is use HTTP as a simple messaging protocol. Yes, we've thro
 
 That replaces the HTTP server and client with ultra-high performance zeromq sockets. Now, protocols have varying strengths and weaknesses, and ZeroMQ is not HTTP necessarily, for instance, given a :zmq_pub socket, you can only send_messages, but there is no response message, because :zmq_pub is the publishing end of a request/reply pattern. The messaging API attempts to reduce all methods on sockets to the following set:
 
-  * on_recv (sometimes takes a block with |message,response| if it can send a response)
+  * on_receive (sometimes takes a block with |message,response| if it can send a response)
   * send_message
   * on_open  (Websockets only)
   * on_close (Websockets only)
@@ -88,7 +88,7 @@ The tools mentioned above are useful, but if you try and build a larger app you'
     # The method #run here is merely a convention
     class StatsCollector < DripDrop::Node::Nodelet
       def run
-        stats_raw.on_recv do |raw_stat_msg|
+        stats_raw.on_receive do |raw_stat_msg|
           # Custom filtering code could go here...
           stats_filtered.send_message(raw_stat_msg)
         end
@@ -103,7 +103,7 @@ The tools mentioned above are useful, but if you try and build a larger app you'
       end
       
       def run
-        stats_ingress.on_recv do |message|
+        stats_ingress.on_receive do |message|
           @name_counts[message.name] += 1
           puts @name_counts.inspect
         end

data/example/combined.rb

@@ -10,15 +10,15 @@ DripDrop::Node.new do
   route :http_collector, :http_server,   'http://127.0.0.1:8080'
   route :http_agent,     :http_client,   http_collector.address
     
-  stats_sub1.on_recv do |message|
+  stats_sub1.on_receive do |message|
     puts "Receiver 1: #{message.body}"
   end
-  stats_sub2.on_recv do |message|
+  stats_sub2.on_receive do |message|
     puts "Receiver 2: #{message.body}"
   end
   
   i = 0
-  http_collector.on_recv do |message,response|
+  http_collector.on_receive do |message,response|
     i += 1
     stats_pub.send_message(message)
     response.send_message(:name => 'ack', :body => {:seq => i})

data/example/complex/server.rb

@@ -29,7 +29,7 @@ class Coordinator < DripDrop::Node::Nodelet
   end
 
   def proxy_reqs
-    reqs_in.on_recv do |message, response|
+    reqs_in.on_receive do |message, response|
       puts "Proxying #{message.inspect} to htout"
       reqs_htout.send_message(message) do |http_response|
         puts "Received http response #{http_response.inspect} sending back"
@@ -58,7 +58,7 @@ class WSListener < DripDrop::Node::Nodelet
 
   def broadcast_to_websockets
     # Receives messages from Broadcast Out
-    broadcast_in.on_recv do |message|
+    broadcast_in.on_receive do |message|
       puts "Broadcast In recv: #{message.inspect}"
       @client_channel.push(message)
     end
@@ -87,7 +87,7 @@ class WSListener < DripDrop::Node::Nodelet
       @client_channel.unsubscribe sigs_sids[conn.signature]
     end
 
-    ws.on_recv do |message,conn|
+    ws.on_receive do |message,conn|
       puts "WS Recv #{message.name}"
       reqs_out.send_message(message) do |resp_message|
         puts "Recvd resp_message #{resp_message.inspect}, sending back to client"

data/example/http.rb

@@ -5,7 +5,7 @@ DripDrop::Node.new do
   addr = 'http://127.0.0.1:2200'
   
   i = 0 
-  http_server(addr).on_recv do |msg,response|
+  http_server(addr).on_receive do |msg,response|
     i += 1
     response.send_message(msg)
   end

data/example/pubsub.rb

@@ -4,24 +4,24 @@ Thread.abort_on_exception = true
 
 #Define our handlers
 DripDrop::Node.new do
-  route :pub,  :zmq_publish,   'tcp://localhost:2200', :bind
+  route :pub,  :zmq_publish,   'tcp://127.0.0.1:2200', :bind
   route :sub1, :zmq_subscribe, pub.address, :connect, :topic_filter => /[13579]$/
   route :sub2, :zmq_subscribe, pub.address, :connect, :topic_filter => /[02468]$/
   route :sub3, :zmq_subscribe, pub.address, :connect
     
-  sub1.on_recv do |message|
+  sub1.on_receive do |message|
     puts "Receiver 1 #{message.inspect}"
   end
 
-  sub2.on_recv do |message|
+  sub2.on_receive do |message|
     puts "Receiver 2 #{message.inspect}"
   end
 
-  sub3.on_recv do |message|
+  sub3.on_receive do |message|
     puts "Receiver 3 #{message.inspect}"
   end
   
-  zm_reactor.periodical_timer(500) do
+  EM::PeriodicTimer.new(0.5) do
     puts "Sending!"
     #Sending a hash as a message implicitly transforms it into a DripDrop::Message
     pub.send_message(:name => Time.now.to_i.to_s, :body => 'Test Payload')

data/example/pushpull.rb

@@ -4,10 +4,10 @@ Thread.abort_on_exception = true
 DripDrop::Node.new do
   z_addr = 'tcp://127.0.0.1:2200'
    
-  zmq_pull(z_addr, :connect).on_recv do |message|
+  zmq_pull(z_addr, :connect).on_receive do |message|
     puts "Receiver 2 #{message.body}"
   end
-  zmq_pull(z_addr, :connect).on_recv do |message|
+  zmq_pull(z_addr, :connect).on_receive do |message|
     puts "Receiver 1 #{message.body}"
   end
   push = zmq_push(z_addr, :bind)

data/example/subclass.rb

@@ -36,13 +36,13 @@ node = DripDrop::Node.new do
   pull1 = zmq_pull("tcp://127.0.0.1:2201", :connect)
   pull2 = zmq_pull("tcp://127.0.0.1:2202", :connect)
 
-  pull1.on_recv do |msg|
+  pull1.on_receive do |msg|
     puts "Pull 1 #{msg.head.inspect}"
     sleep 1
     push2.send_message(msg)
   end
 
-  pull2.on_recv do |msg|
+  pull2.on_receive do |msg|
     puts "Pull 2 #{msg.head.inspect}"
   end
 

data/example/xreq_xrep.rb

@@ -5,7 +5,7 @@ DripDrop::Node.new do
   route :xrep_server, :zmq_xrep, 'tcp://127.0.0.1:2200', :bind
   route :xreq_client, :zmq_xreq, xrep_server.address,    :connect
    
-  xrep_server.on_recv do |message,response|
+  xrep_server.on_receive do |message,response|
     puts "REP #{message.body}"
     response.send_message(message)
   end

data/js/dripdrop.html

@@ -2,9 +2,9 @@
                     "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <head>
-  <script src="../jquery.js"></script>
-  <script src="../jquery.json.js"></script>
-  <script src="../dripdrop.js"></script>
+  <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.5.1/jquery.min.js"></script>
+  <script src="jquery.json.js"></script>
+  <script src="dripdrop.js"></script>
   
   <link rel="stylesheet" href="qunit.css" type="text/css" media="screen" />
   <script type="text/javascript" src="qunit.js"></script>
@@ -15,7 +15,7 @@ $(document).ready(function(){
 
 /* Test Helpers */
 function TSock()  {return new DD.WebSocket('ws://localhost:2702')};
-function THTTP()  {return new DD.HTTP('http://localhost:2703')};
+function THTTP()  {return new DD.HTTPClient('http://localhost:2703')};
 
 //Faked message to for a websocket
 function FakeWSMessage(ddMessage) {
@@ -85,13 +85,13 @@ module("DD.WebSocket");
     });
   });
   
-  test("onRecv should trigger the passed in callback", function() {
+  test("onReceive should trigger the passed in callback", function() {
     expect(3);
     
     var expectedMsg = new DD.Message('foo');
     
     var tSock = new TSock; 
-    tSock.onRecv(function(msg) {
+    tSock.onReceive(function(msg) {
       ok(true, "Function executed");
       equals(msg.constructor,DD.Message, "Is a DD.Message");
       equals(msg.name, expectedMsg.name);
@@ -115,13 +115,14 @@ module("DD.WebSocket");
 module("DD.HTTP");
 
   test("Creation", function() {
-    var dht = new DD.HTTP;
-    equals(dht.constructor, DD.HTTP, "Constructor Match");
+    var dht = new DD.HTTPClient;
+    equals(dht.constructor, DD.HTTPClient, "Constructor Match");
   });
   
+  // Not sure how to mock / stub this into working
   test("Sending a message should call a get posting a JSON representation of the data",function() {
     expect(1);
-    var tHTTP = new THTTP;
+    var tHTTP = THTTP;
     tHTTP.sendMessage();
   });
 

data/js/dripdrop.js

@@ -16,7 +16,7 @@ function DripDrop() {
   /* A DripDrop friendly WebSocket Object. 
      This automatically converts messages to DD.Message objects.
      Additionally, this uses friendlier callback methods, closer to the DripDrop
-     server-side API, like onOpen, onRecv, onError, and onClose. */
+     server-side API, like onOpen, onReceive, onError, and onClose. */
   this.WebSocket = function(url) {
     this.socket = new WebSocket(url);
     
@@ -25,7 +25,7 @@ function DripDrop() {
       return this;
     };
     
-    this.onRecv = function(callback) {
+    this.onReceive = function(callback) {
       this.socket.onmessage = function(wsMessage) {
         var json = $.parseJSON(wsMessage.data)
         var message = new DD.Message(json.name, {head: json.head, body: json.body});
@@ -56,14 +56,14 @@ function DripDrop() {
   };
    
   /* A DripDrop friendly HTTP Request. */
-  this.HTTP = function(url) {
+  this.HTTPClient = function(url) {
     this.url = url;
      
-    this.onRecv = function(data) {};
+    this.onReceive = function(data) {};
     this.sendMessage = function() {
       var response = new this.HTTPResponse;
       $.post(this.url, function(json) {
-        this.onRecv(new DD.Message(json.name, {head: json.head, body: json.body}));
+        this.onReceive(new DD.Message(json.name, {head: json.head, body: json.body}));
       });
     };
   };

data/js/jquery.json.js

@@ -0,0 +1,31 @@
+
+(function($){$.toJSON=function(o)
+{if(typeof(JSON)=='object'&&JSON.stringify)
+return JSON.stringify(o);var type=typeof(o);if(o===null)
+return"null";if(type=="undefined")
+return undefined;if(type=="number"||type=="boolean")
+return o+"";if(type=="string")
+return $.quoteString(o);if(type=='object')
+{if(typeof o.toJSON=="function")
+return $.toJSON(o.toJSON());if(o.constructor===Date)
+{var month=o.getUTCMonth()+1;if(month<10)month='0'+month;var day=o.getUTCDate();if(day<10)day='0'+day;var year=o.getUTCFullYear();var hours=o.getUTCHours();if(hours<10)hours='0'+hours;var minutes=o.getUTCMinutes();if(minutes<10)minutes='0'+minutes;var seconds=o.getUTCSeconds();if(seconds<10)seconds='0'+seconds;var milli=o.getUTCMilliseconds();if(milli<100)milli='0'+milli;if(milli<10)milli='0'+milli;return'"'+year+'-'+month+'-'+day+'T'+
+hours+':'+minutes+':'+seconds+'.'+milli+'Z"';}
+if(o.constructor===Array)
+{var ret=[];for(var i=0;i<o.length;i++)
+ret.push($.toJSON(o[i])||"null");return"["+ret.join(",")+"]";}
+var pairs=[];for(var k in o){var name;var type=typeof k;if(type=="number")
+name='"'+k+'"';else if(type=="string")
+name=$.quoteString(k);else
+continue;if(typeof o[k]=="function")
+continue;var val=$.toJSON(o[k]);pairs.push(name+":"+val);}
+return"{"+pairs.join(", ")+"}";}};$.evalJSON=function(src)
+{if(typeof(JSON)=='object'&&JSON.parse)
+return JSON.parse(src);return eval("("+src+")");};$.secureEvalJSON=function(src)
+{if(typeof(JSON)=='object'&&JSON.parse)
+return JSON.parse(src);var filtered=src;filtered=filtered.replace(/\\["\\\/bfnrtu]/g,'@');filtered=filtered.replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,']');filtered=filtered.replace(/(?:^|:|,)(?:\s*\[)+/g,'');if(/^[\],:{}\s]*$/.test(filtered))
+return eval("("+src+")");else
+throw new SyntaxError("Error parsing JSON, source is not valid.");};$.quoteString=function(string)
+{if(string.match(_escapeable))
+{return'"'+string.replace(_escapeable,function(a)
+{var c=_meta[a];if(typeof c==='string')return c;c=a.charCodeAt();return'\\u00'+Math.floor(c/16).toString(16)+(c%16).toString(16);})+'"';}
+return'"'+string+'"';};var _escapeable=/["\\\x00-\x1f\x7f-\x9f]/g;var _meta={'\b':'\\b','\t':'\\t','\n':'\\n','\f':'\\f','\r':'\\r','"':'\\"','\\':'\\\\'};})(jQuery);

data/lib/dripdrop/handlers/http_server.rb

@@ -50,10 +50,15 @@ class DripDrop
       @message_class = @opts[:message_class] || DripDrop.default_message_class
     end
     
-    def on_recv(msg_format=:dripdrop_json,&block)
+    def on_receive(msg_format=:dripdrop_json,&block)
       @recv_cbak = block
       @conn = EM.start_server(@uri.host, @uri.port, HTTPEMServer, self)
       self
     end
+
+    def on_recv(*args,&block)
+      $stderr.write "DripDrop Warning :on_recv is deprecated in favor of :on_receive"
+      on_receive(*args,&block)
+    end
   end
 end

data/lib/dripdrop/handlers/websocket_server.rb

@@ -43,11 +43,16 @@ class DripDrop
       end
     end
 
-    def on_recv(&block)
+    def on_receive(&block)
       @raw = false
       @onmessage_handler = block
       self
     end
+    
+    def on_recv(&block)
+      $stderr.write "DripDrop Warning :on_recv is deprecated in favor of :on_receive"
+      on_receive(&block)
+    end
 
     def on_recv_raw(&block)
       @raw = true

data/lib/dripdrop/handlers/zeromq.rb

@@ -33,10 +33,15 @@ class DripDrop
       @connection
     end
 
-    def on_recv(msg_format=:dripdrop,&block)
+    def on_receive(msg_format=:dripdrop,&block)
       @recv_cbak = block
       self
     end
+     
+    def on_recv(*args,&block)
+      $stderr.write "DripDrop Warning :on_recv is deprecated in favor of :on_receive"
+      on_receive(*args,&block)
+    end
 
     def address
       self.connection.address
@@ -261,7 +266,8 @@ class DripDrop
       @seq_counter = 0
       @promises = {}
 
-      self.on_recv do |message|
+      # should never be handled by the user
+      self.on_receive do |message|
         begin
           seq = message.head[SEQ_CTR_KEY]
           raise "Missing Seq Counter" unless seq

data/lib/dripdrop/node.rb

@@ -179,7 +179,7 @@ class DripDrop
       zmq_handler(DripDrop::Mongrel2Handler, [ZMQ::PULL, ZMQ::PUB], addresses, [:connect, :connect], opts)
     end
 
-    # Creates a ZMQ::SUB type socket. Can only receive messages via +on_recv+.
+    # Creates a ZMQ::SUB type socket. Can only receive messages via +on_receive+.
     # zmq_subscribe sockets have a +topic_filter+ option, which restricts which
     # messages they can receive. It takes a regexp as an option.
     def zmq_subscribe(address,socket_ctype,opts={},&block)
@@ -191,7 +191,7 @@ class DripDrop
       zmq_handler(DripDrop::ZMQPubHandler,ZMQ::PUB,address,socket_ctype,opts)
     end
 
-    # Creates a ZMQ::PULL type socket. Can only receive messages via +on_recv+
+    # Creates a ZMQ::PULL type socket. Can only receive messages via +on_receive+
     def zmq_pull(address,socket_ctype,opts={},&block)
       zmq_handler(DripDrop::ZMQPullHandler,ZMQ::PULL,address,socket_ctype,opts)
     end
@@ -205,11 +205,11 @@ class DripDrop
     # powerful, so their functionality is currently limited. XREP sockets in DripDrop can reply
     # to the original source of the message.
     #
-    # Receiving with XREP sockets in DripDrop is different than other types of sockets, on_recv
+    # Receiving with XREP sockets in DripDrop is different than other types of sockets, on_receive
     # passes 2 arguments to its callback, +message+, and +response+. A minimal example is shown below:
     #
     #    
-    #    zmq_xrep(z_addr, :bind).on_recv do |message,response|
+    #    zmq_xrep(z_addr, :bind).on_receive do |message,response|
     #      response.send_message(message)
     #    end
     #
@@ -223,12 +223,12 @@ class DripDrop
     end
 
     # Binds an EM websocket server connection to +address+. takes blocks for
-    # +on_open+, +on_recv+, +on_close+ and +on_error+.
+    # +on_open+, +on_receive+, +on_close+ and +on_error+.
     #
-    # For example +on_recv+ could be used to echo incoming messages thusly:
+    # For example +on_receive+ could be used to echo incoming messages thusly:
     #    websocket_server(addr).on_open {|conn|
     #      ws.send_message(:name => 'ws_open_ack')
-    #    }.on_recv {|msg,conn|
+    #    }.on_receive {|msg,conn|
     #      conn.send(msg)
     #    }.on_close {|conn|
     #    }.on_error {|reason,conn|
@@ -249,7 +249,7 @@ class DripDrop
     end
     
     # Starts a new Thin HTTP server listening on address.
-    # Can have an +on_recv+ handler that gets passed +msg+ and +response+ args.
+    # Can have an +on_receive+ handler that gets passed +msg+ and +response+ args.
     #    http_server(addr) {|msg,response| response.send_message(msg)}
     def http_server(address,opts={},&block)
       uri     = URI.parse(address)

data/lib/dripdrop/version.rb

@@ -1,3 +1,3 @@
 class DripDrop
-  VERSION = "0.10.0"
+  VERSION = "0.11.0"
 end

data/spec/node/http_spec.rb

@@ -16,7 +16,7 @@ describe "http" do
       
       client = http_client(addr)
       
-      server = http_server(addr).on_recv do |message,response|
+      server = http_server(addr).on_receive do |message,response|
         $stdout.flush
         responses << message
         response.send_message(message)

data/spec/node/websocket_spec.rb

@@ -21,7 +21,7 @@ describe "websockets" do
       server.on_open do |conn|
         conn.send_message(open_message)
         seen_signatures << conn.signature
-      end.on_recv do |message,conn|
+      end.on_receive do |message,conn|
         received << message
         conn.send_message(message)
       end.on_close do |conn|

data/spec/node/zmq_m2_spec.rb

@@ -38,12 +38,12 @@ describe "zmq m2" do
       
       dd = zmq_m2([addr, addr2])
 
-      dd.on_recv do |req|
+      dd.on_receive do |req|
         requests << req
         dd.reply_http req, "Hello from DripDrop"
       end
 
-      m2_recv.on_recv do |msg|
+      m2_recv.on_receive do |msg|
         responses << msg
       end
 

data/spec/node/zmq_pushpull_spec.rb

@@ -16,11 +16,11 @@ describe "zmq push/pull" do
       pull2 = zmq_pull(addr, :connect)
       pull = [pull1, pull2] 
       
-      pull1.on_recv do |message|
+      pull1.on_receive do |message|
         message.head['recv_sock'] = 1
         responses << message
       end
-       pull2.on_recv do |message|
+       pull2.on_receive do |message|
         message.head['recv_sock'] = 2
         responses << message
       end

data/spec/node/zmq_xrepxreq_spec.rb

@@ -13,7 +13,7 @@ describe "zmq xreq/xrep" do
       rep = zmq_xrep(addr, :bind)
       req = zmq_xreq(addr, :connect)
       
-      rep.on_recv do |message,response|
+      rep.on_receive do |message,response|
         recvd << {:message => message, :response => response}
         
         response.send_message :name => 'response', :body => {'orig_name' => message.name}
@@ -83,7 +83,7 @@ describe "zmq xreq/xrep" do
         req1 = zmq_xreq(addr, :connect)
         req2 = zmq_xreq(addr, :connect)
         
-        rep.on_recv do |message,response|
+        rep.on_receive do |message,response|
           response.send_message(message)
         end
          

metadata

@@ -2,7 +2,7 @@
 name: dripdrop
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors: 
 - Andrew Cholakian
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-12 23:00:00 -08:00
+date: 2011-03-20 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -111,6 +111,7 @@ files:
 - example/xreq_xrep.rb
 - js/dripdrop.html
 - js/dripdrop.js
+- js/jquery.json.js
 - js/qunit.css
 - js/qunit.js
 - lib/dripdrop.rb