dripdrop 0.8.1 → 0.9.2

data/Rakefile

@@ -14,9 +14,9 @@ begin
     gem.add_dependency('eventmachine')
     gem.add_dependency('em-websocket')
     gem.add_dependency('thin')
-    gem.add_dependency('zmqmachine')
+    gem.add_dependency('em-zeromq')
     gem.add_dependency('msgpack')
-    gem.add_dependency('json')
+    gem.add_dependency('yajl-ruby')
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.8.1
+0.9.2

data/dripdrop.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dripdrop}
-  s.version = "0.8.1"
+  s.version = "0.9.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrew Cholakian"]
-  s.date = %q{2011-01-30}
+  s.date = %q{2011-02-01}
   s.description = %q{Evented framework for ZeroMQ and EventMachine Apps. }
   s.email = %q{andrew@andrewvc.com}
   s.extra_rdoc_files = [
@@ -88,26 +88,26 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<eventmachine>, [">= 0"])
       s.add_runtime_dependency(%q<em-websocket>, [">= 0"])
       s.add_runtime_dependency(%q<thin>, [">= 0"])
-      s.add_runtime_dependency(%q<zmqmachine>, [">= 0"])
+      s.add_runtime_dependency(%q<em-zeromq>, [">= 0"])
       s.add_runtime_dependency(%q<msgpack>, [">= 0"])
-      s.add_runtime_dependency(%q<json>, [">= 0"])
+      s.add_runtime_dependency(%q<yajl-ruby>, [">= 0"])
     else
       s.add_dependency(%q<ffi-rzmq>, [">= 0"])
       s.add_dependency(%q<eventmachine>, [">= 0"])
       s.add_dependency(%q<em-websocket>, [">= 0"])
       s.add_dependency(%q<thin>, [">= 0"])
-      s.add_dependency(%q<zmqmachine>, [">= 0"])
+      s.add_dependency(%q<em-zeromq>, [">= 0"])
       s.add_dependency(%q<msgpack>, [">= 0"])
-      s.add_dependency(%q<json>, [">= 0"])
+      s.add_dependency(%q<yajl-ruby>, [">= 0"])
     end
   else
     s.add_dependency(%q<ffi-rzmq>, [">= 0"])
     s.add_dependency(%q<eventmachine>, [">= 0"])
     s.add_dependency(%q<em-websocket>, [">= 0"])
     s.add_dependency(%q<thin>, [">= 0"])
-    s.add_dependency(%q<zmqmachine>, [">= 0"])
+    s.add_dependency(%q<em-zeromq>, [">= 0"])
     s.add_dependency(%q<msgpack>, [">= 0"])
-    s.add_dependency(%q<json>, [">= 0"])
+    s.add_dependency(%q<yajl-ruby>, [">= 0"])
   end
 end
 

data/example/pushpull.rb

@@ -13,7 +13,7 @@ DripDrop::Node.new do
   push = zmq_push(z_addr, :bind)
 
   i = 0
-  zm_reactor.periodical_timer(800) do
+  EM::PeriodicTimer.new(1) do
     i += 1
     puts i
     push.send_message(:name => 'test', :body => "Test Payload #{i}")

data/example/xreq_xrep.rb

@@ -11,7 +11,7 @@ DripDrop::Node.new do
   end
 
   i = 0; k = 0
-  zm_reactor.periodical_timer(1000) do
+  EM::PeriodicTimer.new(1) do
     i += 1; k += 1
      
     xreq_client.send_message(:name => 'test', :body => "Test Payload i#{i}") do |message|

data/lib/dripdrop/handlers/http.rb

@@ -1,6 +1,5 @@
 require 'thin'
 require 'thin_parser'
-require 'json'
 
 class DripDrop
   class HTTPDeferrableBody < BaseHandler

data/lib/dripdrop/handlers/zeromq.rb

@@ -1,6 +1,8 @@
 require 'ffi-rzmq'
+require 'em-zeromq'
 
 class DripDrop
+  
   #Setup the default message class handler first
   class << self
     attr_accessor :default_message_class
@@ -9,26 +11,12 @@ class DripDrop
   end
 
   class ZMQBaseHandler < BaseHandler
-    attr_reader :address, :socket_ctype, :socket
-
-    def initialize(zaddress,zm_reactor,socket_ctype,opts={})
-      @zaddress     = zaddress
-      @address      = @zaddress.to_s
-      @zm_reactor   = zm_reactor
-      @socket_ctype = socket_ctype # :bind or :connect
-      @debug        = opts[:debug] # TODO: Start actually using this
-      @opts         = opts
-    end
+    attr_accessor :connection
 
-    def on_attach(socket)
-      @socket = socket
-      if    @socket_ctype == :bind
-        socket.bind(@zaddress)
-      elsif @socket_ctype == :connect
-        socket.connect(@zaddress)
-      else
-        EM.next_tick { raise "Unsupported socket ctype '#{@socket_ctype}'. Expected :bind or :connect" }
-      end
+    def initialize(opts={})
+      @opts         = opts
+      @connection   = nil
+      @msg_format   = opts[:msg_format] || :dripdrop
     end
 
     def on_recv(msg_format=:dripdrop,&block)
@@ -36,6 +24,13 @@ class DripDrop
       @recv_cbak = block
       self
     end
+
+    def address
+      self.connection.address
+    end
+
+    #Triggered after a handler is setup
+    def post_setup; end
   end
 
   module ZMQWritableHandler
@@ -51,20 +46,20 @@ class DripDrop
         num_parts = message.length
         message.each_with_index do |part,i|
           # Set the multi-part flag unless this is the last message
-          multipart_flag = i + 1 < num_parts ? true : false
+          multipart_flag = i + 1 < num_parts ? ZMQ::SNDMORE : 0
 
           if part.class == ZMQ::Message
-            socket.send_message(part, multipart_flag)
+            socket.send(part, multipart_flag)
           else
             if part.class == String
-              socket.send_message_string(part, multipart_flag)
+              socket.send_string(part, multipart_flag)
             else
               $stderr.write "Can only send Strings, not #{part.class}: #{part}" if @debug
             end
           end
         end
       else
-        @zm_reactor.deregister_writable(socket)
+        @connection.deregister_writable
       end
     end
 
@@ -81,7 +76,7 @@ class DripDrop
       else
         @send_queue.push([message])
       end
-      @zm_reactor.register_writable(@socket)
+      @connection.register_writable
     end
   end
 
@@ -98,18 +93,16 @@ class DripDrop
     end
 
     def on_readable(socket, messages)
-      EM.next_tick {
-        case @msg_format
-        when :raw
-          @recv_cbak.call(messages)
-        when :dripdrop
-          raise "Expected message in one part" if messages.length > 1
-          body  = messages.shift.copy_out_string
-          @recv_cbak.call(decode_message(body))
-        else
-          raise "Unknown message format '#{@msg_format}'"
-        end
-      }
+      case @msg_format
+      when :raw
+        @recv_cbak.call(messages)
+      when :dripdrop
+        raise "Expected message in one part" if messages.length > 1
+        body  = messages.shift.copy_out_string
+        @recv_cbak.call(decode_message(body))
+      else
+        raise "Unknown message format '#{@msg_format}'"
+      end
     end
   end
 
@@ -123,27 +116,23 @@ class DripDrop
       self.topic_filter = @opts[:topic_filter]
     end
 
-    def on_attach(socket)
-      super(socket)
-      socket.subscribe('')
-    end
-
     def on_readable(socket, messages)
-      EM.next_tick {
-        if @msg_format == :dripdrop
-          unless messages.length == 2
-            puts "Expected pub/sub message to come in two parts, not #{messages.length}: #{messages.inspect}"
-            return false
-          end
-          topic = messages.shift.copy_out_string
-          if @topic_filter.nil? || topic.match(@topic_filter)
-            body  = messages.shift.copy_out_string
-            @recv_cbak.call(decode_message(body))
-          end
-        else
-          super(socket,messages)
+      if @msg_format == :dripdrop
+        unless messages.length == 2
+          return false
+        end
+        topic = messages.shift.copy_out_string
+        if @topic_filter.nil? || topic.match(@topic_filter)
+          body  = messages.shift.copy_out_string
+          @recv_cbak.call(decode_message(body))
         end
-      }
+      else
+        super(socket,messages)
+      end
+    end
+
+    def post_setup
+      @connection.socket.setsockopt(ZMQ::SUBSCRIBE, '')
     end
   end
 
@@ -180,18 +169,16 @@ class DripDrop
     end
 
     def on_readable(socket,messages)
-      EM.next_tick {
-        if @msg_format == :dripdrop
-          identities = messages[0..-2].map {|m| m.copy_out_string}
-          body       = messages.last.copy_out_string
-          message    = decode_message(body)
-          seq        = message.head['_dripdrop/x_seq_counter']
-          response   = ZMQXRepHandler::Response.new(self, identities,seq)
-          @recv_cbak.call(message,response)
-        else
-          super(socket,messages)
-        end
-      }
+      if @msg_format == :dripdrop
+        identities = messages[0..-2].map {|m| m.copy_out_string}
+        body       = messages.last.copy_out_string
+        message    = decode_message(body)
+        seq        = message.head['_dripdrop/x_seq_counter']
+        response   = ZMQXRepHandler::Response.new(self, identities,seq)
+        @recv_cbak.call(message,response)
+      else
+        super(socket,messages)
+      end
     end
 
     def send_message(message,identities,seq)
@@ -230,12 +217,10 @@ class DripDrop
       @promises = {}
 
       self.on_recv do |message|
-        EM.next_tick {
-          seq = message.head['_dripdrop/x_seq_counter']
-          raise "Missing Seq Counter" unless seq
-          promise = @promises.delete(seq)
-          promise.call(message) if promise
-        }
+        seq = message.head['_dripdrop/x_seq_counter']
+        raise "Missing Seq Counter" unless seq
+        promise = @promises.delete(seq)
+        promise.call(message) if promise
       end
     end
 

data/lib/dripdrop/message.rb

@@ -1,6 +1,6 @@
 require 'rubygems'
 require 'msgpack'
-require 'json'
+require 'yajl'
 
 class DripDrop
   # DripDrop::Message messages are exchanged between all tiers in the architecture
@@ -19,6 +19,7 @@ class DripDrop
   # head should be used for metadata, body for the actual data.
   # These definitions are intentionally loose, because protocols tend to be used loosely.
   class Message
+     
     attr_accessor :name, :head, :body
 
     # Creates a new message.
@@ -43,7 +44,7 @@ class DripDrop
 
     # Encodes the hash represntation of the message to JSON
     def json_encoded
-      self.to_hash.to_json
+      Yajl::Encoder.encode self.to_hash
     end
     # (Deprecated, use json_encoded)
     def encode_json; json_encoded; end
@@ -94,8 +95,8 @@ class DripDrop
     # Decodes a string containing a JSON representation of a message
     def self.decode_json(str)
       begin
-        json_hash = JSON.parse(str)
-      rescue JSON::ParserError => e
+        json_hash = Yajl::Parser.parse(str)
+      rescue Yajl::ParserError => e
         puts "Could not parse msg '#{str}': #{e.message}"
         return nil
       end

data/lib/dripdrop/node.rb

@@ -1,6 +1,5 @@
 require 'rubygems'
 require 'ffi-rzmq'
-require 'zmqmachine'
 require 'eventmachine'
 require 'uri'
 require 'resolv'
@@ -15,11 +14,12 @@ require 'dripdrop/handlers/http'
 
 class DripDrop
   class Node
+    ZCTX = ZMQ::Context.new 1
+    
     attr_reader   :zm_reactor, :routing, :nodelets
     attr_accessor :debug
     
     def initialize(opts={},&block)
-      @zm_reactor = nil # The instance of the zmq_machine reactor
       @block      = block
       @thread     = nil # Thread containing the reactors
       @routing    = {}  # Routing table
@@ -27,6 +27,7 @@ class DripDrop
       @recipients_for       = {}
       @handler_default_opts = {:debug => @debug}
       @nodelets   = {}  # Cache of registered nodelets
+      @zctx = ZCTX
     end
 
     # Starts the reactors and runs the block passed to initialize.
@@ -35,15 +36,12 @@ class DripDrop
       @thread = Thread.new do
         EM.error_handler {|e| self.error_handler e}
         EM.run do
-          ZM::Reactor.new(:my_reactor).run do |zm_reactor|
-            @zm_reactor = zm_reactor
-            if @block
-              self.instance_eval(&@block)
-            elsif self.respond_to?(:action)
-              self.action
-            else
-              raise "Could not start, no block or action specified"
-            end
+          if @block
+            self.instance_eval(&@block)
+          elsif self.respond_to?(:action)
+            self.action
+          else
+            raise "Could not start, no block or action specified"
           end
         end
       end
@@ -68,7 +66,6 @@ class DripDrop
 
     # Stops the reactors. If you were blocked on #join, that will unblock.
     def stop
-      @zm_reactor.stop
       EM.stop
     end
 
@@ -153,22 +150,22 @@ class DripDrop
     # 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)
-      zmq_handler(DripDrop::ZMQSubHandler,:sub_socket,address,socket_ctype,opts)
+      zmq_handler(DripDrop::ZMQSubHandler,ZMQ::SUB,address,socket_ctype,opts)
     end
 
     # Creates a ZMQ::PUB type socket, can only send messages via +send_message+
     def zmq_publish(address,socket_ctype,opts={})
-      zmq_handler(DripDrop::ZMQPubHandler,:pub_socket,address,socket_ctype,opts)
+      zmq_handler(DripDrop::ZMQPubHandler,ZMQ::PUB,address,socket_ctype,opts)
     end
 
     # Creates a ZMQ::PULL type socket. Can only receive messages via +on_recv+
     def zmq_pull(address,socket_ctype,opts={},&block)
-      zmq_handler(DripDrop::ZMQPullHandler,:pull_socket,address,socket_ctype,opts)
+      zmq_handler(DripDrop::ZMQPullHandler,ZMQ::PULL,address,socket_ctype,opts)
     end
 
     # Creates a ZMQ::PUSH type socket, can only send messages via +send_message+
     def zmq_push(address,socket_ctype,opts={})
-      zmq_handler(DripDrop::ZMQPushHandler,:push_socket,address,socket_ctype,opts)
+      zmq_handler(DripDrop::ZMQPushHandler,ZMQ::PUSH,address,socket_ctype,opts)
     end
 
     # Creates a ZMQ::XREP type socket, both sends and receivesc XREP sockets are extremely
@@ -184,12 +181,12 @@ class DripDrop
     #    end
     #
     def zmq_xrep(address,socket_ctype,opts={})
-      zmq_handler(DripDrop::ZMQXRepHandler,:xrep_socket,address,socket_ctype,opts)
+      zmq_handler(DripDrop::ZMQXRepHandler,ZMQ::XREP,address,socket_ctype,opts)
     end
  
     # See the documentation for +zmq_xrep+ for more info
     def zmq_xreq(address,socket_ctype,opts={})
-      zmq_handler(DripDrop::ZMQXReqHandler,:xreq_socket,address,socket_ctype,opts)
+      zmq_handler(DripDrop::ZMQXReqHandler,ZMQ::XREQ,address,socket_ctype,opts)
     end
 
     # Binds an EM websocket connection to +address+. takes blocks for
@@ -275,18 +272,24 @@ class DripDrop
     end
 
     private
-    
-    def zmq_handler(klass, zm_sock_type, address, socket_ctype, opts={})
+     
+    def zmq_handler(klass, sock_type, address, socket_ctype, opts={})
       addr_uri = URI.parse(address)
-       
-      host = Resolv.getaddresses(addr_uri.host).first
-      host_addr = Resolv.getaddresses('localhost').map {|a| IPAddr.new(a)}.find {|a| a.ipv4?}
-      host_str  = host_addr.ipv6? ? "[#{host_addr.to_s}]" : host_addr.to_s
+      
+      if addr_uri.scheme == 'tcp'  
+        host = Resolv.getaddresses(addr_uri.host).first
+        host_addr = Resolv.getaddresses('localhost').map {|a| IPAddr.new(a)}.find {|a| a.ipv4?}
+        host_str  = host_addr.ipv6? ? "[#{host_addr.to_s}]" : host_addr.to_s
+      else
+        host_str = addr_uri.host
+      end
 
-      zm_addr  = ZM::Address.new(host_str,addr_uri.port.to_i,addr_uri.scheme.to_sym)
-      h_opts   = handler_opts_given(opts)
-      handler  = klass.new(zm_addr,@zm_reactor,socket_ctype,h_opts)
-      @zm_reactor.send(zm_sock_type,handler)
+      z_addr      =  "#{addr_uri.scheme}://#{host_str}:#{addr_uri.port.to_i}"
+      h_opts      = handler_opts_given(opts)
+      connection = EM::ZeroMQ.create @zctx, sock_type, socket_ctype, address, klass.new
+      handler            = connection.handler
+      handler.connection = connection
+      handler.post_setup
       handler
     end   
     

data/spec/node/routing_spec.rb

@@ -24,7 +24,6 @@ describe "routing" do
       @expected_routing.each do |route_name,expected_props|
         handler = @node.send(route_name)
         handler.class.should == expected_props[:class]
-        handler.socket_ctype.should == expected_props[:socket_ctype]
       end
     end
   end
@@ -32,9 +31,9 @@ describe "routing" do
   context "with no groups" do
     before(:all) do
       @expected_routing = {
-        :distributor => {:class => DripDrop::ZMQPushHandler, :socket_ctype => :bind},
-        :worker1     => {:class => DripDrop::ZMQPullHandler, :socket_ctype => :connect},
-        :worker2     => {:class => DripDrop::ZMQPullHandler, :socket_ctype => :connect}
+        :distributor => {:class => DripDrop::ZMQPushHandler},
+        :worker1     => {:class => DripDrop::ZMQPullHandler},
+        :worker2     => {:class => DripDrop::ZMQPullHandler}
       }
       @node = run_reactor do
         route :distributor, :zmq_push, rand_addr, :bind

data/spec/node/zmq_pushpull_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'set'
 
 describe "zmq push/pull" do
   def pp_send_messages(to_send)

data/spec/node/zmq_xrepxreq_spec.rb

@@ -7,7 +7,7 @@ describe "zmq xreq/xrep" do
     req = nil
     rep = nil
     
-    @node = run_reactor do
+    @node = run_reactor(0.5) do
       addr = rand_addr
       
       rep = zmq_xrep(addr, :bind)
@@ -74,7 +74,7 @@ describe "zmq xreq/xrep" do
     it "should send responses back to the proper xreq sender" do
       received_count = 0
       
-      run_reactor(0.2) do
+      run_reactor(0.5) do
         addr = rand_addr
         
         rep  = zmq_xrep(addr, :bind)
@@ -89,14 +89,14 @@ describe "zmq xreq/xrep" do
         r2_msg = DripDrop::Message.new("REQ2 Message")
         
         10.times do
-        req1.send_message(r1_msg) do |message|
-          received_count += 1
-          message.name.should == r1_msg.name
-        end
-        req2.send_message(r2_msg) do |message|
-          received_count += 1
-          message.name.should == r2_msg.name
-        end
+          req1.send_message(r1_msg) do |message|
+            received_count += 1
+            message.name.should == r1_msg.name
+          end
+          req2.send_message(r2_msg) do |message|
+            received_count += 1
+            message.name.should == r2_msg.name
+          end
         end
       end
        

data/spec/node_spec.rb

@@ -56,9 +56,7 @@ describe DripDrop::Node do
   
   describe "shutdown" do
     before do
-      @ddn = DripDrop::Node.new {
-        zmq_subscribe(rand_addr,:bind) #Keeps ZMQMachine Happy
-      }
+      @ddn = DripDrop::Node.new {}
       @ddn.start
       sleep 0.1
       @ddn.stop rescue nil
@@ -68,10 +66,6 @@ describe DripDrop::Node do
     it "should stop EventMachine" do
       EM.reactor_running?.should be_false
     end
-    
-    it "should stop ZMQMachine" do
-      @ddn.zm_reactor.running?.should be_false
-    end
   end
 
   describe "exceptions in EM reactor" do

data/spec/spec_helper.rb

@@ -16,5 +16,3 @@ def run_reactor(time=0.2,opts={},&block)
   sleep 0.1
   ddn
 end
-
-

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dripdrop
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 63
   prerelease: false
   segments: 
   - 0
-  - 8
-  - 1
-  version: 0.8.1
+  - 9
+  - 2
+  version: 0.9.2
 platform: ruby
 authors: 
 - Andrew Cholakian
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-30 00:00:00 -08:00
+date: 2011-02-01 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -75,7 +75,7 @@ dependencies:
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: zmqmachine
+  name: em-zeromq
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -103,7 +103,7 @@ dependencies:
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: json
+  name: yajl-ruby
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false