0mq 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef320e7c2d43b2cd9c7bb4222e128d4ae60a4105
-  data.tar.gz: a0a775f59dd263ef24678183ca8159244e61f0bc
+  metadata.gz: 0f5853df137983c39643738260536be6283df3a5
+  data.tar.gz: b9d8a07715d0a9e28a0d785a96cd2c98b4f5e7ab
 SHA512:
-  metadata.gz: 82fed431aa6fd8431a4154512d6f37af67f219227de66b84bd19c9ecdcc8e0ef6b6396678d3ccf18ca6a29bf4169ad642c9d00e2be75affe54cbd7be5cbc5f2d
-  data.tar.gz: b00911b0781281ac79262fa415b31f9ffda7f0f7978772d47c8612a9f74714987492b6f70c9b0decc47afe83488b7ec8c05851e14b8d62ae651482c544e5d7f0
+  metadata.gz: d71708e4a35e312ac7d4c01fb8193c414f99d90e777784742e1f4e2fa128e8bbd42853e288562e4b0591042703415a05011777622a15a59e10f8501ea8c30577
+  data.tar.gz: f1557ddadcf7b3ed574f74983b0c017db99ffe22946034c21a632acfc28ddb71787544415d8e264da8d54ae0383314e9353b4207f5281c898b7a5d10ba9bf408

data/lib/0mq/poll_interruptible.rb

@@ -17,23 +17,33 @@ module ZMQ
       @int_sock_rep.bind    int_endpoint
       @int_sock_req.connect int_endpoint
       
+      # Interruption blocks are stored here by key until #run receives them.
+      # After each is run, the return value is stored here in its place.
+      @interruptions = {}
+      
       @dead = false
       
       super @int_sock_rep, *sockets
     end
     
-    # Same as Poll#run, but will yield [nil, nil] to the block if interrupted
+    # Same as Poll#run, but will yield [nil, nil] to the block if interrupted.
+    # Return value may be an empty hash if the poller was killed.
     def run(&block)
       raise "#{self} cannot run; it was permanently killed." if @dead
       
       super do |socket, revents|
         if socket == @int_sock_rep
-          result = socket.recv_array
+          key, * = socket.recv_array
+          kill = key == "KILL"
+          
+          # Call the user block of #interrupt and store the return value
+          @interruptions[key] = @interruptions[key].call unless kill
           
+          # Call the user block of #run
           block.call nil, nil if block
           
           socket.send_array ["OKAY"]
-          @int_sock_rep.close if result == ["KILL"]
+          @int_sock_rep.close if kill
         else
           block.call socket, revents if block
         end
@@ -44,11 +54,18 @@ module ZMQ
     # This should be run anytime to let the poller re-evaluate state, etc..
     # This should only be accessed from a thread other than the poll thread,
     #   and only if the poll thread is running
-    def interrupt
-      @int_sock_req.send_string ""
-      @int_sock_req.recv_array
+    # If a block is given, it will be executed in the poll thread just
+    #   prior to the execution of the user block passed to {#run}.
+    def interrupt(&block)
+      block ||= Proc.new { true }
+      key = block.object_id.to_s 36
+      
+      @interruptions[key] = block # Store the block to be called
+      
+      @int_sock_req.send_string key # Signal an interruption to #run
+      @int_sock_req.recv_array      # Wait until it has been handled by #run
       
-      true
+      @interruptions.delete key # Return the stored result of the block
     end
     
     # Interrupt the running poll loop and permanently kill the Poll object

data/lib/0mq/socket.rb

@@ -121,17 +121,17 @@ module ZMQ
     end
     
     # Send a multipart message as an array of strings
-    def send_array(array)
+    def send_array(array, flags = 0)
       array = array.to_a
-      array[0...-1].each { |str| send_string str, ZMQ::SNDMORE }
-      send_string array.last
+      array[0...-1].each { |str| send_string str, ZMQ::SNDMORE|flags }
+      send_string array.last, flags
     end
     
     # Receive a multipart message as an array of strings
-    def recv_array
+    def recv_array(flags = 0)
       [].tap do |ary|
         loop do
-          ary << recv_string
+          ary << recv_string(flags)
           break unless get_opt(ZMQ::RCVMORE)
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: 0mq
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Joe McIlvain
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-29 00:00:00.000000000 Z
+date: 2014-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi-rzmq-core
@@ -147,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: 0mq