0mq 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 773f90d7147a3cbb26b3a5d5133c16e36ec81da5
-  data.tar.gz: 5a241ddd18035b6d933ae28ac328062351d31d48
+  metadata.gz: 86e8b8e57ecbb3d3133df643d848ca1532985386
+  data.tar.gz: 23db53fb586e9501727f3ba449373ea45fec6e0b
 SHA512:
-  metadata.gz: 6c986fc018852a26c27241a1f256f20f6066177d9c4590b1da43f35240c33b50522e0cf1e13aa0afe7f9e24027650f3fc424c3d7a8ba7626e8dcd3cbd3c306b3
-  data.tar.gz: d8d5fbc4bd75afa98b4a8101335eda0744a5cd21a73f699c71f3f12650ebd9746bf48b0801bbc71f688d1953f07e59ac8f35c548f88bd793c18ff5d7f9c05e54
+  metadata.gz: 36cc44a8b6906a6f854db3eeb5cc96ed9dca8dee2cf2aa61a84e5074828135a5471b2b49526a9e186dec36312718ab676a5e308ea69c5bc133996d5fc64dd2dd
+  data.tar.gz: 5cbeb65decd7de7e5f54609b5911a5f0edb872a53f4e6e8082adb809f53a42670025b2acfd5172ef0fd5a8d92b73480cddee0e4aecc1a8c454e4ef8ec24f72b1

data/lib/0mq/socket.rb

@@ -1,4 +1,6 @@
 
+require_relative 'socket/options'
+
 module ZMQ
   
   class Socket
@@ -6,8 +8,8 @@ module ZMQ
     attr_reader :context
     attr_reader :type
     
-    def initialize(type, context:ZMQ::DefaultContext)
-      @context = context
+    def initialize(type, opts={})
+      @context = opts.fetch :context, ZMQ::DefaultContext
       @type = type
       @ptr = LibZMQ.zmq_socket @context.ptr, @type
       
@@ -115,6 +117,35 @@ module ZMQ
       end
     end
     
+    # Send a multipart message as routing array and a body array
+    # All parts before an empty part are considered routing parts,
+    # and all parta after the empty part are considered body parts.
+    # The empty delimiter part should not be included in the input arrays.
+    def send_with_routing(routing, body)
+      send_array [*routing, '', *body]
+    end
+    
+    # Receive a multipart message as routing array and a body array
+    # All parts before an empty part are considered routing parts,
+    # and all parta after the empty part are considered body parts.
+    # The empty delimiter part is not included in the resulting arrays.
+    def recv_with_routing
+      [[],[]].tap do |routing, body|
+        loop do
+          nxt = recv_string
+          break if nxt.empty?
+          routing << nxt
+          raise ArgumentError, "Expected empty routing delimiter in "\
+                               "multipart message: #{routing}" \
+                                unless get_opt ZMQ::RCVMORE
+        end
+        loop do
+          body << recv_string
+          break unless get_opt(ZMQ::RCVMORE)
+        end
+      end
+    end
+    
     # Set a socket option
     def set_opt(option, value)
       type = @@option_types.fetch(option) \
@@ -171,89 +202,6 @@ module ZMQ
       ]
     end
     
-    @@option_types = {
-    # Get options
-      ZMQ::RCVMORE             => :bool,
-      ZMQ::RCVHWM              => :int,
-      ZMQ::AFFINITY            => :uint64,
-      ZMQ::IDENTITY            => :string,
-      ZMQ::RATE                => :int,
-      ZMQ::RECOVERY_IVL        => :int,
-      ZMQ::SNDBUF              => :int,
-      ZMQ::RCVBUF              => :int,
-      ZMQ::LINGER              => :int,
-      ZMQ::RECONNECT_IVL       => :int,
-      ZMQ::RECONNECT_IVL_MAX   => :int,
-      ZMQ::BACKLOG             => :int,
-      ZMQ::MAXMSGSIZE          => :int64,
-      ZMQ::MULTICAST_HOPS      => :int,
-      ZMQ::RCVTIMEO            => :int,
-      ZMQ::SNDTIMEO            => :int,
-      ZMQ::IPV6                => :bool,
-      ZMQ::IPV4ONLY            => :bool,
-      ZMQ::IMMEDIATE           => :bool,
-      ZMQ::FD                  => :int,
-      ZMQ::EVENTS              => :int,
-      ZMQ::LAST_ENDPOINT       => :string,
-      ZMQ::TCP_KEEPALIVE       => :int,
-      ZMQ::TCP_KEEPALIVE_IDLE  => :int,
-      ZMQ::TCP_KEEPALIVE_CNT   => :int,
-      ZMQ::TCP_KEEPALIVE_INTVL => :int,
-      ZMQ::MECHANISM           => :int,
-      ZMQ::PLAIN_SERVER        => :int,
-      ZMQ::PLAIN_USERNAME      => :string,
-      ZMQ::PLAIN_PASSWORD      => :string,
-      ZMQ::CURVE_PUBLICKEY     => :string,
-      ZMQ::CURVE_SECRETKEY     => :string,
-      ZMQ::CURVE_SERVERKEY     => :string,
-      ZMQ::ZAP_DOMAIN          => :string,
-    }.merge({
-    # Set options
-      ZMQ::SNDHWM              => :int,
-      ZMQ::RCVHWM              => :int,
-      ZMQ::AFFINITY            => :uint64,
-      ZMQ::SUBSCRIBE           => :string,
-      ZMQ::UNSUBSCRIBE         => :string,
-      ZMQ::IDENTITY            => :string,
-      ZMQ::RATE                => :int,
-      ZMQ::RECOVERY_IVL        => :int,
-      ZMQ::SNDBUF              => :int,
-      ZMQ::RCVBUF              => :int,
-      ZMQ::LINGER              => :int,
-      ZMQ::RECONNECT_IVL       => :int,
-      ZMQ::RECONNECT_IVL_MAX   => :int,
-      ZMQ::RECONNECT_IVL       => :int,
-      ZMQ::BACKLOG             => :int,
-      ZMQ::MAXMSGSIZE          => :int64,
-      ZMQ::MULTICAST_HOPS      => :int,
-      ZMQ::RCVTIMEO            => :int,
-      ZMQ::SNDTIMEO            => :int,
-      ZMQ::IPV6                => :bool,
-      ZMQ::IPV4ONLY            => :bool,
-      ZMQ::IMMEDIATE           => :bool,
-      ZMQ::ROUTER_HANDOVER     => :int,
-      ZMQ::ROUTER_MANDATORY    => :int,
-      ZMQ::ROUTER_RAW          => :int,
-      ZMQ::PROBE_ROUTER        => :int,
-      ZMQ::XPUB_VERBOSE        => :int,
-      ZMQ::REQ_CORRELATE       => :int,
-      ZMQ::REQ_RELAXED         => :int,
-      ZMQ::TCP_KEEPALIVE       => :int,
-      ZMQ::TCP_KEEPALIVE_IDLE  => :int,
-      ZMQ::TCP_KEEPALIVE_CNT   => :int,
-      ZMQ::TCP_KEEPALIVE_INTVL => :int,
-      ZMQ::TCP_ACCEPT_FILTER   => :string,
-      ZMQ::PLAIN_SERVER        => :int,
-      ZMQ::PLAIN_USERNAME      => :string,
-      ZMQ::PLAIN_PASSWORD      => :string,
-      ZMQ::CURVE_SERVER        => :int,
-      ZMQ::CURVE_PUBLICKEY     => :string,
-      ZMQ::CURVE_SECRETKEY     => :string,
-      ZMQ::CURVE_SERVERKEY     => :string,
-      ZMQ::ZAP_DOMAIN          => :string,
-      ZMQ::CONFLATE            => :bool,
-    })
-    
   end
   
 end

data/lib/0mq/socket/options.rb

@@ -0,0 +1,113 @@
+
+module ZMQ
+  
+  class Socket
+    
+    @@get_options = {
+      :RCVMORE             => :bool,
+      :RCVHWM              => :int,
+      :AFFINITY            => :uint64,
+      :IDENTITY            => :string,
+      :RATE                => :int,
+      :RECOVERY_IVL        => :int,
+      :SNDBUF              => :int,
+      :RCVBUF              => :int,
+      :LINGER              => :int,
+      :RECONNECT_IVL       => :int,
+      :RECONNECT_IVL_MAX   => :int,
+      :BACKLOG             => :int,
+      :MAXMSGSIZE          => :int64,
+      :MULTICAST_HOPS      => :int,
+      :RCVTIMEO            => :int,
+      :SNDTIMEO            => :int,
+      :IPV6                => :bool,
+      :IPV4ONLY            => :bool,
+      :IMMEDIATE           => :bool,
+      :FD                  => :int,
+      :EVENTS              => :int,
+      :LAST_ENDPOINT       => :string,
+      :TCP_KEEPALIVE       => :int,
+      :TCP_KEEPALIVE_IDLE  => :int,
+      :TCP_KEEPALIVE_CNT   => :int,
+      :TCP_KEEPALIVE_INTVL => :int,
+      :MECHANISM           => :int,
+      :PLAIN_SERVER        => :int,
+      :PLAIN_USERNAME      => :string,
+      :PLAIN_PASSWORD      => :string,
+      :CURVE_PUBLICKEY     => :string,
+      :CURVE_SECRETKEY     => :string,
+      :CURVE_SERVERKEY     => :string,
+      :ZAP_DOMAIN          => :string,
+    }
+    
+    @@set_options = {
+      :SNDHWM              => :int,
+      :RCVHWM              => :int,
+      :AFFINITY            => :uint64,
+      :SUBSCRIBE           => :string,
+      :UNSUBSCRIBE         => :string,
+      :IDENTITY            => :string,
+      :RATE                => :int,
+      :RECOVERY_IVL        => :int,
+      :SNDBUF              => :int,
+      :RCVBUF              => :int,
+      :LINGER              => :int,
+      :RECONNECT_IVL       => :int,
+      :RECONNECT_IVL_MAX   => :int,
+      :RECONNECT_IVL       => :int,
+      :BACKLOG             => :int,
+      :MAXMSGSIZE          => :int64,
+      :MULTICAST_HOPS      => :int,
+      :RCVTIMEO            => :int,
+      :SNDTIMEO            => :int,
+      :IPV6                => :bool,
+      :IPV4ONLY            => :bool,
+      :IMMEDIATE           => :bool,
+      :ROUTER_HANDOVER     => :int,
+      :ROUTER_MANDATORY    => :int,
+      :ROUTER_RAW          => :int,
+      :PROBE_ROUTER        => :int,
+      :XPUB_VERBOSE        => :int,
+      :REQ_CORRELATE       => :int,
+      :REQ_RELAXED         => :int,
+      :TCP_KEEPALIVE       => :int,
+      :TCP_KEEPALIVE_IDLE  => :int,
+      :TCP_KEEPALIVE_CNT   => :int,
+      :TCP_KEEPALIVE_INTVL => :int,
+      :TCP_ACCEPT_FILTER   => :string,
+      :PLAIN_SERVER        => :int,
+      :PLAIN_USERNAME      => :string,
+      :PLAIN_PASSWORD      => :string,
+      :CURVE_SERVER        => :int,
+      :CURVE_PUBLICKEY     => :string,
+      :CURVE_SECRETKEY     => :string,
+      :CURVE_SERVERKEY     => :string,
+      :ZAP_DOMAIN          => :string,
+      :CONFLATE            => :bool,
+    }
+    
+    # Set up map of option codes to option types
+    @@option_types = {}
+    @@get_options.each_pair { |n,t| @@option_types[ZMQ.const_get(n)] = t }
+    @@set_options.each_pair { |n,t| @@option_types[ZMQ.const_get(n)] = t }
+    
+  public
+    
+    # Define the socket option reader methods
+    @@get_options.keys.each do |name|
+      code = ZMQ.const_get(name)
+      # Get the given socket option
+      define_method(name.downcase) { get_opt code }
+    end
+    
+    # Define the socket option writer methods
+    @@set_options.keys.each do |name|
+      code = ZMQ.const_get(name)
+      name = :"#{name}=" unless [:SUBSCRIBE, :UNSUBSCRIBE].include? name
+      # Set the given socket option
+      define_method(name.downcase) { |val| set_opt code, val }
+    end
+    
+  end
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: 0mq
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Joe McIlvain
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-26 00:00:00.000000000 Z
+date: 2014-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi-rzmq-core
@@ -120,6 +120,7 @@ files:
 - lib/0mq/error_map.rb
 - lib/0mq/proxy.rb
 - lib/0mq/socket.rb
+- lib/0mq/socket/options.rb
 homepage: https://github.com/jemc/0mq/
 licenses:
 - MIT