dripdrop 0.4.0 → 0.4.1

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.1

data/dripdrop.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dripdrop}
-  s.version = "0.4.0"
+  s.version = "0.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrew Cholakian"]
-  s.date = %q{2010-11-15}
+  s.date = %q{2010-11-16}
   s.description = %q{Evented framework for ZeroMQ and EventMachine Apps. }
   s.email = %q{andrew@andrewvc.com}
   s.extra_rdoc_files = [

data/lib/dripdrop/handlers/zeromq.rb

@@ -198,7 +198,7 @@ class DripDrop
     end
   end
   
-  class ZMQXRepHandler::Response
+  class ZMQXRepHandler::Response < ZMQBaseHandler
     attr_accessor :xrep, :seq, :identities
     
     def initialize(xrep,identities,seq)
@@ -208,7 +208,8 @@ class DripDrop
     end
     
     def send_message(message)
-      @xrep.send_message(message,identities,seq)
+      dd_message = dd_messagify(message)
+      @xrep.send_message(dd_message,identities,seq)
     end
   end
 

data/spec/node/zmq_xrepxreq_spec.rb

@@ -2,7 +2,8 @@ require 'spec_helper'
 
 describe "zmq xreq/xrep" do
   def xr_tranceive_messages(to_send,&block)
-    recvd = []
+    recvd   = []
+    replied = []
     req = nil
     rep = nil
     
@@ -14,26 +15,39 @@ describe "zmq xreq/xrep" do
       
       rep.on_recv do |message,response|
         recvd << {:message => message, :response => response}
+        
+        response.send_message :name => 'response', :body => {:orig_name => message.name}
       end
        
-      to_send.each {|message| req.send_message(message)}
+      to_send.each do |message|
+        req.send_message(message) do |reply_message|
+          replied << reply_message
+        end
+      end
     end
     
-    {:recvd => recvd, :handlers => {:req => req, :rep => rep}}
+    {:recvd => recvd, :replied => replied, :handlers => {:req => req, :rep => rep}}
   end
   describe "basic sending and receiving" do
     before(:all) do
       @sent = []
       10.times {|i| @sent << DripDrop::Message.new("test-#{i}")}
       xr_info = xr_tranceive_messages(@sent)
-      @recvd  = xr_info[:recvd]
+      @recvd    = xr_info[:recvd]
+      @replied  = xr_info[:replied]
       @req_handler  = xr_info[:handlers][:req]
       @rep_handler  = xr_info[:handlers][:rep]
     end
 
     it "should receive all sent messages in order" do
       @sent.zip(@recvd).each do |sent,recvd|
-        sent.name.should == recvd[:message].name
+        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.body[:orig_name].should == sent.name
       end
     end
     

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 0
-  version: 0.4.0
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Andrew Cholakian
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-15 00:00:00 -08:00
+date: 2010-11-16 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency