dripdrop 0.0.3 → 0.1.0

data/lib/dripdrop/node.rb

@@ -0,0 +1,103 @@
+require 'rubygems'
+require 'ffi-rzmq'
+require 'zmqmachine'
+require 'eventmachine'
+require 'uri'
+
+require 'dripdrop/message'
+require 'dripdrop/handlers/zeromq'
+require 'dripdrop/handlers/websockets'
+
+class DripDrop
+  class Node
+    attr_reader   :zm_reactor
+    attr_accessor :debug
+    
+    def initialize(opts={},&block)
+      @handlers = {}
+      @debug    = opts[:debug]
+      @recipients_for = {}
+      @handler_default_opts = {:debug => @debug}
+      @zm_reactor = nil
+      
+      EM.run do
+        ZM::Reactor.new(:my_reactor).run do |zm_reactor|
+          @zm_reactor = zm_reactor
+          block.call(self)
+        end
+      end
+    end
+     
+    def zmq_subscribe(address,socket_ctype,opts={},&block)
+      zm_addr = str_to_zm_address(address)
+      h_opts  = handler_opts_given(opts)
+      handler = DripDrop::ZMQSubHandler.new(zm_addr,@zm_reactor,socket_ctype,h_opts)
+      @zm_reactor.sub_socket(handler)
+      handler
+    end
+
+    def zmq_publish(address,socket_ctype,opts={})
+      zm_addr = str_to_zm_address(address)
+      h_opts  = handler_opts_given(opts)
+      handler = DripDrop::ZMQPubHandler.new(zm_addr,@zm_reactor,socket_ctype,h_opts)
+      @zm_reactor.pub_socket(handler)
+      handler
+    end
+
+    def zmq_pull(address,socket_ctype,opts={},&block)
+      zm_addr = str_to_zm_address(address)
+      h_opts  = handler_opts_given(opts)
+      handler = DripDrop::ZMQPullHandler.new(zm_addr,@zm_reactor,socket_ctype,h_opts)
+      @zm_reactor.pull_socket(handler)
+      handler
+    end
+
+    def zmq_push(address,socket_ctype,opts={})
+      zm_addr = str_to_zm_address(address)
+      h_opts  = handler_opts_given(opts)
+      handler = DripDrop::ZMQPushHandler.new(zm_addr,@zm_reactor,socket_ctype,h_opts)
+      @zm_reactor.push_socket(handler)
+      handler
+    end
+    
+    def websocket(address,opts={},&block)
+      uri     = URI.parse(address)
+      h_opts  = handler_opts_given(opts)
+      handler = DripDrop::WebSocketHandler.new(uri,h_opts)
+      handler
+    end
+
+    def send_internal(dest,data)
+      return false unless @recipients_for[dest]
+      blocks = @recipients_for[dest].values
+      return false unless blocks
+      blocks.each do |block|
+        block.call(data)
+      end
+    end
+
+    def recv_internal(dest,identifier,&block)
+      if @recipients_for[dest]
+        @recipients_for[dest][identifier] =  block
+      else
+        @recipients_for[dest] = {identifier => block}
+      end
+    end
+
+    def remove_recv_internal(dest,identifier)
+      return false unless @recipients_for[dest]
+      @recipients_for[dest].delete(identifier)
+    end
+
+    private
+    
+    def str_to_zm_address(str)
+      addr_uri = URI.parse(str)
+      ZM::Address.new(addr_uri.host,addr_uri.port.to_i,addr_uri.scheme.to_sym)
+    end
+    
+    def handler_opts_given(opts)
+      @handler_default_opts.merge(opts)
+    end
+  end
+end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dripdrop
 version: !ruby/object:Gem::Version 
+  hash: 27
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 3
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors: 
 - Andrew Cholakian
@@ -14,40 +15,69 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-14 00:00:00 -07:00
+date: 2010-09-05 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: zmq
+  name: ffi-rzmq
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: ffi
+  name: eventmachine
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: bert
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: json
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id004
 description: 0MQ App stats
 email: andrew@andrewvc.com
-executables: 
-- drip-mlogger
-- drip-publisher
+executables: []
+
 extensions: []
 
 extra_rdoc_files: 
@@ -60,23 +90,17 @@ files:
 - README.md
 - Rakefile
 - VERSION
-- bin/drip-mlogger
-- bin/drip-publisher
 - doc_img/topology.png
 - dripdrop.gemspec
 - example/agent_test.rb
-- example/forwarder.cfg
-- example/web/public/js/jquery.gracefulWebSocket.js
-- example/web/public/js/jquery.js
-- example/web/public/js/jquery.websocket.js
-- example/web/public/view.html
-- example/web/server.rb
+- example/pubsub.rb
+- example/pushpull.rb
 - lib/dripdrop.rb
 - lib/dripdrop/agent.rb
-- lib/dripdrop/collector.rb
+- lib/dripdrop/handlers/websockets.rb
+- lib/dripdrop/handlers/zeromq.rb
 - lib/dripdrop/message.rb
-- lib/dripdrop/mlogger.rb
-- lib/dripdrop/publisher.rb
+- lib/dripdrop/node.rb
 has_rdoc: true
 homepage: http://github.com/andrewvc/dripdrop
 licenses: []
@@ -91,6 +115,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -99,6 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"

data/bin/drip-mlogger

@@ -1,8 +0,0 @@
-#!/usr/bin/env ruby
-require 'rubygems'
-require 'dripdrop/mlogger'
-
-mlogger = DripDrop::MLogger.new
-puts "Starting MLogger"
-mlogger.run
-puts "Done"

data/bin/drip-publisher

@@ -1,8 +0,0 @@
-#!/usr/bin/env ruby
-require 'dripdrop/publisher'
-require 'dripdrop/message'
-
-publisher = DripDrop::Publisher.new
-puts "Starting Publisher"
-publisher.run
-puts "Done"

data/example/forwarder.cfg

@@ -1,8 +0,0 @@
-<forwarder>
-    <in>
-        <bind addr = "tcp://127.0.0.1:2900">
-    </in>
-    <out>
-        <bind addr = "tcp://127.0.0.1:2901"/>
-    </out>
-</forwarder>

data/example/web/public/js/jquery.gracefulWebSocket.js

@@ -1,165 +0,0 @@
-/**
- * WebSocket with graceful degradation - jQuery plugin
- * @author David Lindkvist
- * @version 0.1
- * 
- * Returns an object implementing the WebSocket API. 
- * 
- * If browser supports WebSockets a native WebSocket instance is returned. 
- * If not, a simulated half-duplex implementation is returned which uses polling 
- * over HTTP to retrieve new messages
- * 
- * OPTIONS
- * -----------------------------------------------------------------------------
- * 
- * {Number}		fallbackOpenDelay		number of ms to delay simulated open 
- * 										event for fallback
- * {Number}		fallbackPollInterval	number of ms between requests for 
- * 										fallback polling
- * {Object}		fallbackPollParams		optional params to pass with each poll 
- * 										requests
- * 
- * EXAMPLES
- * -----------------------------------------------------------------------------
- * 
- * 	var websocket = $.gracefulWebSocket("ws://127.0.0.1:8080/");
- * 
- * 	var websocket = $.gracefulWebSocket({
- * 		fallbackPollParams:  {
- * 			"latestMessageID": function () {
- * 				return latestMessageID;
- * 			}
- *  	} 
- * 	});
- * 
- */
-
-(function ($) {
-
-	$.extend({
-	
-		gracefulWebSocket: function (url, options) {
-		
-			// Default properties 
-			this.defaults = {
-				keepAlive: false,		// not implemented - should ping server to keep socket open
-				autoReconnect: false,	// not implemented - should try to reconnect silently if socket is closed
-				fallback: true,			// not implemented - always use HTTP fallback if native browser support is missing
-				fallbackSendURL: url.replace('ws:', 'http:').replace('wss:', 'https:'),
-				fallbackSendMethod: 'POST',
-				fallbackPollURL: url.replace('ws:', 'http:').replace('wss:', 'https:'),
-				fallbackPollMethod: 'GET',
-				fallbackOpenDelay: 100,	// number of ms to delay simulated open event
-				fallbackPollInterval: 3000,	// number of ms between poll requests
-				fallbackPollParams: {}		// optional params to pass with poll requests
-			};
-			
-			// Override defaults with user properties
-			var opts = $.extend({}, this.defaults, options);
-			
-			/**
-			 * Creates a fallback object implementing the WebSocket interface
-			 */
-			function FallbackSocket() {
-				
-				// WebSocket interface constants
-				const CONNECTING = 0;
-				const OPEN = 1;
-				const CLOSING = 2;
-				const CLOSED = 3;
-				
-				var pollInterval;
-				var openTimout;
-				
-				// create WebSocket object
-				var fws = {
-					// ready state
-					readyState: CONNECTING,
-					bufferedAmount: 0,
-					send: function (data) {
-						var success = true;
-						$.ajax({
-							async: false, // send synchronously
-							type: opts.fallbackSendMethod,
-							url: opts.fallbackSendURL + '?' + $.param( getFallbackParams() ),
-							data: data,
-							dataType: 'text',
-							contentType : "application/x-www-form-urlencoded; charset=utf-8",
-							success: pollSuccess,
-							error: function (xhr) {
-								success = false;
-								$(fws).triggerHandler('error');
-							}
-						});
-						return success;
-					},
-					close: function () {
-						clearTimeout(openTimout);
-						clearInterval(pollInterval);
-						this.readyState = CLOSED;
-						$(fws).triggerHandler('close');
-					},
-					onopen: function () {},
-					onmessage: function () {},
-					onerror: function () {},
-					onclose: function () {},
-					previousRequest: null,
-					currentRequest: null
-				};
-				
-				function getFallbackParams() {
-					
-					// update timestamp of previous and current poll request
-					fws.previousRequest = fws.currentRequest;					
-					fws.currentRequest = new Date().getTime();
-					
-					// extend default params with plugin options
-					return $.extend({"previousRequest": fws.previousRequest, "currentRequest": fws.currentRequest}, opts.fallbackPollParams);
-				}
-				
-				/**
-				 * @param {Object} data
-				 */
-				function pollSuccess(data) {
-					
-					// trigger onmessage
-					var messageEvent = {"data" : data};
-					fws.onmessage(messageEvent);	
-				}
-				
-				function poll() {
-					
-					$.ajax({
-						type: opts.fallbackPollMethod,
-						url: opts.fallbackPollURL,
-						dataType: 'text',
-						data: getFallbackParams(),
-						success: pollSuccess,
-						error: function (xhr) {			
-							$(fws).triggerHandler('error');
-						}
-					});		
-				}
-				
-				// simulate open event and start polling
-				openTimout = setTimeout(function () { 
-					fws.readyState = OPEN;
-					//fws.currentRequest = new Date().getTime();
-					$(fws).triggerHandler('open');
-					poll();
-					pollInterval = setInterval(poll, opts.fallbackPollInterval);
-					
-				}, opts.fallbackOpenDelay);
-				
-				// return socket impl
-				return fws;
-			}
-			
-			// create a new websocket or fallback
-			var ws = window.WebSocket ? new WebSocket(url) : new FallbackSocket();
-	 		$(window).unload(function () { ws.close(); ws = null });
-			return ws;
-		}
-	});
-	
-})(jQuery);