keminglabs-fox-rubby 0.0.2 → 0.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDIyNWEyYjE4Y2FiZDBmZDhhM2Y5NzVmNjljNzQxYWY3YzNhZjA2Yg==
+    NDk2MTQwNzFlM2U3NzBmNmZmZmQyNmNkNTdkZmU3MTM0NTUzMzI2Nw==
   data.tar.gz: !binary |-
-    YTBlZTQ1N2QzNTEwYmNhMTIxZjlhZWNlOTc3M2M1YjQyMGUyODBjMA==
+    NmM4ZjY3YzA5NzhhMjE2ZjYwODJlMDUwM2UzOTMxNjZhYWYyNjY3ZA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NjMwOGMzOTBjODhjMzcwOWRmNGE5M2ZhMzYyNjVlZmM0YTNlZGQzYTUwODEx
-    Y2MwYzQ0NmRlM2ZjYjE4NzBhMTE2ZmU1NWI5ZDcxMDEwNzBhOTdhNjZiZmU1
-    OGE3N2YwM2M2MTVlNDg5ODIyZjcxMmYxNWFhZDViODgwYTgzNjg=
+    MGRiMmZjNWU1ZDMxYjYwMDAwMzU2MTNlZmZhMTNjNzQ5YWMxOTliZGU3YzVj
+    OTEyMWM1N2RiODBiYzI4ZmUxZmVhNjJmZWNkNGUxNDRmMzBmYzM1OTlmNjNi
+    OTk2MTYzMzQwZWZiNTNlZjU4YzVkMWVlMWJmYzg1NzdjODEwMWY=
   data.tar.gz: !binary |-
-    Njc3NWIxZTE2ZDE2MTdmZWMzZjY1ZTUzYjhlMjU5M2Q3NjM5ZWQ1MzFlZGE5
-    YzQ5Y2YyYWEwZmFiODM2N2FiYmVjNTk4NzFiZWRkODA2NjdkNjYwNzUxMDM3
-    Y2MzMGRkMDZmMWFjYzQxZDI1NzU5Y2RiZGFlZjg5N2QwYmE4NGI=
+    MDBhNzlhMDg4MGRkYjgzOTY5NjJiZmU5YmM1MWNjZjE5ZDZkMDdiY2NhNzY1
+    M2E1MTFmZGNkMjExN2MwNzllODY5MDUyNmVjOTkyNWFkYTg4YmE2MWI5OTc3
+    MDZjMGEwYWE3ZWEwYmY3ZjdjNWE0Yjg4ZGNkMWFlZjY2ZjY5YzM=

data/lib/keminglabs-fox-rubby/version.rb

@@ -1,3 +1,3 @@
 module Fox
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/keminglabs-fox-rubby.rb

@@ -20,9 +20,9 @@ module Fox
   #If something isn't met, raises a special exception that's rescued by the main run loop and turned into an abort message.
   def self._assert(raise_p, req, *dependencies)
     deps = dependencies.flatten.uniq.compact
-    
+
     return true if deps.empty?
-    
+
     sock = Context.socket(ZMQ::REQ)
     sock.connect req[:socket]
     sock.send_string JSON.generate({target: req[:target], dependencies: deps})
@@ -40,27 +40,27 @@ module Fox
     end
   end
 
-  
+
   def self.assert(req, *dependencies)
     self._assert true, req, dependencies
   end
 
-  
+
   def self.register(path, handler)
     FileUtils.mkdir_p SockPath + "/" + File.dirname(path)
-    sock = Context.socket(ZMQ::REP)
+    sock = Context.socket(ZMQ::ROUTER)
     sock.bind "ipc://#{SockPath}/#{path}.ipc"
     @handlers[sock] = {handler: handler, path: path}
     nil
   end
 
-  
+
   def self.start!
     @handlers.each do |sock, h|
       $stderr.puts "Registering handler at: #{h[:path]}"
-      Poller.register(sock, ZMQ::POLLIN)
+      Poller.register_readable sock
     end
-    
+
     Signal.trap("INT") do
       break
       Context.terminate
@@ -69,18 +69,17 @@ module Fox
     loop do
       Poller.poll(:blocking)
       Poller.readables.each do |sock|
-        req = recv sock
+        id, req = recv_multipart sock
         msg = begin
                 parse_handler_response @handlers[sock][:handler].call(req)
               rescue Abort => _
                 {exit: "abort"}
               rescue Exception => e
-                pp e
                 $stderr.puts e
                 {exit: "fail", log: e.to_s}
               end
         $stderr.puts "#{msg[:exit]}: #{req[:target]}"
-        send! sock, msg
+        send! sock, id, msg
       end
     end
   end
@@ -90,15 +89,16 @@ module Fox
   private
 
 
-  def self.send!(sock, msg)
-    sock.send_string JSON.generate msg
+  def self.send!(sock, id, msg)
+    sock.send_strings [id, "", JSON.generate(msg)]
   end
 
-  
-  def self.recv(sock)
-    msg_str = ""
-    sock.recv_string msg_str
-    JSON.parse msg_str, symbolize_names: true
+  def self.recv_multipart(sock)
+    parts = []
+    sock.recvmsgs parts
+    id, _, msg = parts
+
+    [id.copy_out_string, JSON.parse(msg.copy_out_string, symbolize_names: true)]
   end
 
 
@@ -125,5 +125,5 @@ module Fox
     end
   end
 
-  
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: keminglabs-fox-rubby
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Kevin J. Lynagh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-30 00:00:00.000000000 Z
+date: 2013-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi-rzmq