dripdrop 0.9.2 → 0.9.3

data/Rakefile

@@ -10,11 +10,11 @@ begin
     gem.email = "andrew@andrewvc.com"
     gem.homepage = "http://github.com/andrewvc/dripdrop"
     gem.authors = ["Andrew Cholakian"]
-    gem.add_dependency('ffi-rzmq')
-    gem.add_dependency('eventmachine')
+    gem.add_dependency('ffi-rzmq', '>= 0.7.1')
+    gem.add_dependency('eventmachine', '>= 0.12.10')
     gem.add_dependency('em-websocket')
     gem.add_dependency('thin')
-    gem.add_dependency('em-zeromq')
+    gem.add_dependency('em-zeromq', '>= 0.1.2')
     gem.add_dependency('msgpack')
     gem.add_dependency('yajl-ruby')
   end

data/VERSION

@@ -1 +1 @@
-0.9.2
+0.9.3

data/dripdrop.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dripdrop}
-  s.version = "0.9.2"
+  s.version = "0.9.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrew Cholakian"]
-  s.date = %q{2011-02-01}
+  s.date = %q{2011-02-02}
   s.description = %q{Evented framework for ZeroMQ and EventMachine Apps. }
   s.email = %q{andrew@andrewvc.com}
   s.extra_rdoc_files = [
@@ -84,28 +84,28 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<ffi-rzmq>, [">= 0"])
-      s.add_runtime_dependency(%q<eventmachine>, [">= 0"])
+      s.add_runtime_dependency(%q<ffi-rzmq>, [">= 0.7.1"])
+      s.add_runtime_dependency(%q<eventmachine>, [">= 0.12.10"])
       s.add_runtime_dependency(%q<em-websocket>, [">= 0"])
       s.add_runtime_dependency(%q<thin>, [">= 0"])
-      s.add_runtime_dependency(%q<em-zeromq>, [">= 0"])
+      s.add_runtime_dependency(%q<em-zeromq>, [">= 0.1.2"])
       s.add_runtime_dependency(%q<msgpack>, [">= 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<ffi-rzmq>, [">= 0.7.1"])
+      s.add_dependency(%q<eventmachine>, [">= 0.12.10"])
       s.add_dependency(%q<em-websocket>, [">= 0"])
       s.add_dependency(%q<thin>, [">= 0"])
-      s.add_dependency(%q<em-zeromq>, [">= 0"])
+      s.add_dependency(%q<em-zeromq>, [">= 0.1.2"])
       s.add_dependency(%q<msgpack>, [">= 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<ffi-rzmq>, [">= 0.7.1"])
+    s.add_dependency(%q<eventmachine>, [">= 0.12.10"])
     s.add_dependency(%q<em-websocket>, [">= 0"])
     s.add_dependency(%q<thin>, [">= 0"])
-    s.add_dependency(%q<em-zeromq>, [">= 0"])
+    s.add_dependency(%q<em-zeromq>, [">= 0.1.2"])
     s.add_dependency(%q<msgpack>, [">= 0"])
     s.add_dependency(%q<yajl-ruby>, [">= 0"])
   end

data/lib/dripdrop/handlers/zeromq.rb

@@ -2,6 +2,7 @@ require 'ffi-rzmq'
 require 'em-zeromq'
 
 class DripDrop
+  SEQ_CTR_KEY = '_dd/xctr'
   
   #Setup the default message class handler first
   class << self
@@ -37,6 +38,7 @@ class DripDrop
     def initialize(*args)
       super(*args)
       @send_queue = []
+      @send_queue_enabled = true
     end
 
     def on_writable(socket)
@@ -46,20 +48,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 ? ZMQ::SNDMORE : 0
+          flags = (i + 1 < num_parts ? ZMQ::SNDMORE : 0) + ZMQ::NOBLOCK
 
           if part.class == ZMQ::Message
-            socket.send(part, multipart_flag)
+            socket.send(part, flags)
           else
             if part.class == String
-              socket.send_string(part, multipart_flag)
+              socket.send_string(part, flags)
             else
               $stderr.write "Can only send Strings, not #{part.class}: #{part}" if @debug
             end
           end
         end
       else
-        @connection.deregister_writable
+        @connection.deregister_writable if @send_queue_enabled
       end
     end
 
@@ -76,7 +78,16 @@ class DripDrop
       else
         @send_queue.push([message])
       end
-      @connection.register_writable
+        
+      
+      if @send_queue_enabled
+        @connection.register_writable
+         
+        # Not sure why this is necessary, this is likely a bug in em-zeromq
+        on_writable(@connection.socket)
+      else
+        on_writable(@connection.socket)
+      end
     end
   end
 
@@ -104,6 +115,10 @@ class DripDrop
         raise "Unknown message format '#{@msg_format}'"
       end
     end
+
+    def post_setup
+      @connection.register_readable
+    end
   end
 
   class ZMQSubHandler < ZMQBaseHandler
@@ -132,6 +147,7 @@ class DripDrop
     end
 
     def post_setup
+      super
       @connection.socket.setsockopt(ZMQ::SUBSCRIBE, '')
     end
   end
@@ -173,7 +189,7 @@ class 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']
+        seq        = message.head[SEQ_CTR_KEY]
         response   = ZMQXRepHandler::Response.new(self, identities,seq)
         @recv_cbak.call(message,response)
       else
@@ -183,10 +199,13 @@ class DripDrop
 
     def send_message(message,identities,seq)
       if message.is_a?(DripDrop::Message)
-        message.head['_dripdrop/x_seq_counter'] = seq
-        super(identities + [message.encoded])
+        message.head[SEQ_CTR_KEY] = seq
+         
+        resp  = identities + ['', message.encoded]
+        super(resp)
       else
-        super(message)
+        resp  = identities + ['', message]
+        super(resp)
       end
     end
   end
@@ -217,7 +236,7 @@ class DripDrop
       @promises = {}
 
       self.on_recv do |message|
-        seq = message.head['_dripdrop/x_seq_counter']
+        seq = message.head[SEQ_CTR_KEY]
         raise "Missing Seq Counter" unless seq
         promise = @promises.delete(seq)
         promise.call(message) if promise
@@ -228,11 +247,16 @@ class DripDrop
       dd_message = dd_messagify(message)
       if dd_message.is_a?(DripDrop::Message)
         @seq_counter += 1
-        dd_message.head['_dripdrop/x_seq_counter'] = @seq_counter
+        dd_message.head[SEQ_CTR_KEY] = @seq_counter
         @promises[@seq_counter] = block if block
         message = dd_message
       end
       super(message)
     end
+
+    def on_readable(socket, messages)
+      # Strip out empty delimiter
+      super(socket, messages[1..-1])
+    end
   end
 end

data/spec/node/zmq_xrepxreq_spec.rb

@@ -7,7 +7,7 @@ describe "zmq xreq/xrep" do
     req = nil
     rep = nil
     
-    @node = run_reactor(0.5) do
+    @node = run_reactor(1.5) do
       addr = rand_addr
       
       rep = zmq_xrep(addr, :bind)
@@ -41,12 +41,14 @@ describe "zmq xreq/xrep" do
 
     it "should receive all sent messages in order" do
       @sent.zip(@recvd).each do |sent,recvd|
+        recvd[:message].should be_a(DripDrop::Message)
         recvd[:message].name.should == sent.name
       end
     end
     
     it "should receive a reply message for each sent message" do
       @sent.zip(@replied).each do |sent, replied|
+        replied.should be_a(DripDrop::Message)
         replied.body['orig_name'].should == sent.name
       end
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dripdrop
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 61
   prerelease: false
   segments: 
   - 0
   - 9
-  - 2
-  version: 0.9.2
+  - 3
+  version: 0.9.3
 platform: ruby
 authors: 
 - Andrew Cholakian
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-01 00:00:00 -08:00
+date: 2011-02-02 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,10 +26,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 1
         segments: 
         - 0
-        version: "0"
+        - 7
+        - 1
+        version: 0.7.1
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -40,10 +42,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 59
         segments: 
         - 0
-        version: "0"
+        - 12
+        - 10
+        version: 0.12.10
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -82,10 +86,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 31
         segments: 
         - 0
-        version: "0"
+        - 1
+        - 2
+        version: 0.1.2
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency