cztop 0.12.2 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2708e0dcccf2c643508cce8f13beda57e2c94c6c
-  data.tar.gz: 283d72a0d068c54b6afa43de7afc2419c63b3dbe
+  metadata.gz: 8ad5ff197b11908dc2757c0ee6a838d6eba71a80
+  data.tar.gz: 9ea6a9d22790c08ca8127a8ee368ee04eed40c17
 SHA512:
-  metadata.gz: f73d2f9ad678244752783832575d767e4adb334aca79740c613f0b39596e39a1f665e5e0ba0b6b1f4b4a49d325ea0fc7d226232f96498acf6e05f269606315a6
-  data.tar.gz: 0b5c571a8b61b47795659940be7659a5837c04d46b52fb578c0d87d099b656a46ef44356e61d644c86a6a44fabe73193ac7a4d5477043cb215007834d22de062
+  metadata.gz: 6024fe538a43ee3da235d86e9eda9ba64bbef99097b509acc14cbc49c4a5d913ea6f467ef1b01669af2b17c272d8fdf7e5a7c2d51743a616d23e272ce1cfecfa
+  data.tar.gz: 1319974428aeab272139a6833cfacc9d8fc141f2974c24b978877835b96e7176cb23f9330c36eeb17b1e75850ae1c483db7e1a481e50bb74ae913644a06d20de

data/CHANGES.md

@@ -1,3 +1,15 @@
+0.13.0 (03/04/2018)
+-----
+* use czmq-ffi-gen 0.15.x
+* CZTop::Monitor#listen: removed HANDSHAKE_FAILED and HANDSHAKE_SUCCEED events
+  and added HANDSHAKE_SUCCEEDED, HANDSHAKE_FAILED_NO_DETAIL,
+  HANDSHAKE:FAILED_PROTOCOL, HANDSHAKE_FAILED_AUTH to reflect changes in CZMQ
+* add CZTop::Monitor#fd and #readable?
+* add CZTop::ZsockOptions#fd (so #fd can be called on Sockets and Actors directly)
+* CZTop::Message#to_a: create less intermediate objects
+* support ZMQ_RECONNECT_IVL option
+* CZTop::Frame#group: return nil if group string is empty
+
 0.12.2 (11/24/2017)
 -----
 * no changes, but this release includes an up-to-date version of this file

data/cztop.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "czmq-ffi-gen", "~> 0.13.0"
+  spec.add_runtime_dependency "czmq-ffi-gen", "~> 0.15.0"
 
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/cztop/frame.rb

@@ -156,13 +156,13 @@ module CZTop
     end
 
     # Gets the group (radio/dish pattern).
-    # @note This only set when the frame has been read from
+    # @note This is only set when the frame has been read from
     #   a {CZTop::Socket::DISH} socket.
     # @return [String] the group
     # @return [nil] when no group has been set
     def group
       group = ffi_delegate.group
-      return nil if group.empty?
+      return nil if group.nil? || group.empty?
       group
     end
 
@@ -174,7 +174,7 @@ module CZTop
     # @return [new_group]
     def group=(new_group)
       rc = ffi_delegate.set_group(new_group)
-      raise_zmq_err("unable to set group to %p" % group) if rc == -1
+      raise_zmq_err("unable to set group to %p" % new_group) if rc == -1
     end
   end
 end

data/lib/cztop/message.rb

@@ -142,7 +142,16 @@ module CZTop
     #   strings. This can be a problem if the message is huge/has huge frames.
     # @return [Array<String>] all frames
     def to_a
-      frames.map(&:to_s)
+      ffi_delegate = ffi_delegate()
+      frame = ffi_delegate.first
+      return [] if frame.null?
+
+      arr = [ frame.data.read_bytes(frame.size) ]
+      while frame = ffi_delegate.next and not frame.null?
+        arr << frame.data.read_bytes(frame.size)
+      end
+
+      return arr
     end
 
     # Inspects this {Message}.

data/lib/cztop/monitor.rb

@@ -39,6 +39,7 @@ module CZTop
 
     # @return [Array<String>] types of valid events
     EVENTS = %w[
+      ALL
       CONNECTED
       CONNECT_DELAYED
       CONNECT_RETRIED
@@ -50,9 +51,10 @@ module CZTop
       CLOSE_FAILED
       DISCONNECTED
       MONITOR_STOPPED
-      HANDSHAKE_FAILED
-      HANDSHAKE_SUCCEED
-      ALL
+      HANDSHAKE_SUCCEEDED
+      HANDSHAKE_FAILED_NO_DETAIL
+      HANDSHAKE_FAILED_PROTOCOL
+      HANDSHAKE_FAILED_AUTH
     ]
 
     # Configure monitor to listen for specific events.
@@ -73,6 +75,18 @@ module CZTop
       @actor.wait
     end
 
+    # Useful for registration in an event-loop.
+    # @return [Integer] the FD
+    # @see ZsockOptions#fd
+    def fd
+      @actor.fd
+    end
+
+    # @return [Boolean] whether there's at least one event available
+    def readable?
+      @actor.readable?
+    end
+
     # Get next event. This blocks until the next event is available.
     # @example
     #   socket = CZTop::Socket::ROUTER.new("tcp://127.0.0.1:5050")
@@ -93,8 +107,8 @@ module CZTop
     #     end
     #   end
     #
-    # @return [String] one of the events from {EVENTS}, something like
-    #   <tt>["ACCEPTED", "73", "tcp://127.0.0.1:55585"]</tt>
+    # @return [Message] one of the events from (after {#to_a} it's something like
+    #   <tt>["ACCEPTED", "73", "tcp://127.0.0.1:55585"]</tt>)
     def next
       @actor.receive
     end

data/lib/cztop/version.rb

@@ -1,3 +1,3 @@
 module CZTop
-  VERSION = "0.12.2"
+  VERSION = "0.13.0"
 end

data/lib/cztop/zsock_options.rb

@@ -29,6 +29,13 @@ module CZTop
       (options.events & Poller::ZMQ::POLLOUT) > 0
     end
 
+    # Useful for registration in an event-loop.
+    # @return [Integer]
+    # @see OptionsAccessor#fd
+    def fd
+      options.fd
+    end
+
     # Used to access the options of a {Socket} or {Actor}.
     class OptionsAccessor
       # @return [Socket, Actor] whose options this {OptionsAccessor} instance
@@ -312,6 +319,20 @@ module CZTop
       # @see CZTop::Poller::ZMQ::POLLIN and CZTop::Poller::ZMQ::POLLOUT
       def events() Zsock.events(@zocket) end
 
+      # @return [Integer] current value of RECONNECT_IVL
+      def reconnect_ivl() Zsock.reconnect_ivl(@zocket) end
+      # This defines the number of milliseconds to wait while
+      # closing/disconnecting a socket if there are outstanding messages to
+      # send.
+      #
+      # Default is 0, which means to not wait at all. -1 means to wait
+      # indefinitely
+      #
+      # @param new_value [Integer] new value for RECONNECT_IVL
+      def reconnect_ivl=(new_value)
+        Zsock.set_reconnect_ivl(@zocket, new_value)
+      end
+
 # TODO: a reasonable subset of these
 #//  Get socket options
 #int zsock_gssapi_server (void *self);
@@ -325,7 +346,6 @@ module CZTop
 #int zsock_recovery_ivl (void *self);
 #int zsock_sndbuf (void *self);
 #int zsock_rcvbuf (void *self);
-#int zsock_reconnect_ivl (void *self);
 #int zsock_reconnect_ivl_max (void *self);
 #int zsock_backlog (void *self);
 #int zsock_maxmsgsize (void *self);
@@ -366,7 +386,6 @@ module CZTop
 #void zsock_set_recovery_ivl (void *self, int recovery_ivl);
 #void zsock_set_sndbuf (void *self, int sndbuf);
 #void zsock_set_rcvbuf (void *self, int rcvbuf);
-#void zsock_set_reconnect_ivl (void *self, int reconnect_ivl);
 #void zsock_set_reconnect_ivl_max (void *self, int reconnect_ivl_max);
 #void zsock_set_backlog (void *self, int backlog);
 #void zsock_set_maxmsgsize (void *self, int maxmsgsize);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cztop
 version: !ruby/object:Gem::Version
-  version: 0.12.2
+  version: 0.13.0
 platform: ruby
 authors:
 - Patrik Wenger
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-24 00:00:00.000000000 Z
+date: 2018-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: czmq-ffi-gen
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 0.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 0.15.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement