ffi-czmq 0.1.3.pre → 0.1.4.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31358d0d534fb15604de3071fb55a7b6a5a59412
-  data.tar.gz: e34e8d89fbf1bd9340eef647f272efef7d196d69
+  metadata.gz: 5bf3cc4225ba9ebcea5caf29a0b3448392cbc2b8
+  data.tar.gz: c4f922d3df650aabfe3cb6d36b530d682581bb79
 SHA512:
-  metadata.gz: 6f11c4f2edd06e534a9950d79e8738d5d96dda9358d6293a737a3dd955ad54036a77083de8ad0da7d59a9d659c1ae5008fc72fe977d415c2c98ce238c87b69e4
-  data.tar.gz: 37dc0dd23fc3e25425093b92f8be989598fba1f98da09dd3a0791b45e77e35b85138a31c588581c21119d0f43fb448598c29e0b274a998267064af865d65a95d
+  metadata.gz: 4e247ff4351a974e62ed4ae7284c3f80fad8a02bbebef9f210357a8188c6e9cfa227538d03aea80892806de80656c7cefbf66f45b0c633fba5665226f1d7e12a
+  data.tar.gz: 2fa83c6efcb617db5193969c8d28046446171842da19fcc96f15a6aae8a229ff7970a9b8f024703be9af93cb38e846615d597437088beff5c249b5d1bd834bda

data/lib/czmq/libczmq.rb

@@ -183,7 +183,9 @@ module LibCZMQ
 
       case #{returns.inspect}
       when :pointer
-        !result.null? ||fail(NoMemoryError, CZMQ::Utils.error, caller)
+        unless #{czmq_class == :zconfig}
+          !result.null? ||fail(NoMemoryError, CZMQ::Utils.error, caller)
+        end
         result
       when :int
         case #{function.inspect}

data/lib/czmq/utils.rb

@@ -7,22 +7,22 @@ module CZMQ
 
     ffi_lib :libzmq, :czmq
 
-    attach_function :zmq_version,   :zmq_version,     [:buffer_out, :buffer_out, :buffer_out], :void,    blocking: true
-    attach_function :zsys_version,  :zsys_version,    [:buffer_out, :buffer_out, :buffer_out], :void,    blocking: true
-    attach_function :errno,         :zmq_errno,       [],                                   :int
-    attach_function :strerror,      :zmq_strerror,    [:int],                               :string
+    attach_function :zmq_version,   :zmq_version,     [:buffer_out, :buffer_out, :buffer_out],  :void,    blocking: true
+    attach_function :zsys_version,  :zsys_version,    [:buffer_out, :buffer_out, :buffer_out],  :void,    blocking: true
+    attach_function :errno,         :zmq_errno,       [],                                       :int,     blocking: true
+    attach_function :strerror,      :zmq_strerror,    [:int],                                   :string,  blocking: true
 
     module_function
 
     def version
       unless @version
-        z_major = FFI::MemoryPointer.new :pointer
-        z_minor = FFI::MemoryPointer.new :pointer
-        z_patch = FFI::MemoryPointer.new :pointer
+        z_major = FFI::MemoryPointer.new :int
+        z_minor = FFI::MemoryPointer.new :int
+        z_patch = FFI::MemoryPointer.new :int
 
-        c_major = FFI::MemoryPointer.new :pointer
-        c_minor = FFI::MemoryPointer.new :pointer
-        c_patch = FFI::MemoryPointer.new :pointer
+        c_major = FFI::MemoryPointer.new :int
+        c_minor = FFI::MemoryPointer.new :int
+        c_patch = FFI::MemoryPointer.new :int
 
         zmq_version  z_major, z_minor, z_patch
         zsys_version c_major, c_minor, c_patch
@@ -45,11 +45,11 @@ module CZMQ
     end
 
     def bin2hex(bytes)
-      bytes.to_str.unpack(HEXY).first
+      String(bytes).unpack(HEXY).first
     end
 
     def hex2bin(hex)
-      [hex].pack(HEXY)
+      [String(hex)].pack(HEXY)
     end
 
     if version[:czmq][:major] < 3

data/lib/czmq/version.rb

@@ -1,3 +1,3 @@
 module CZMQ
-  VERSION = Gem::Version.new('0.1.3.pre')
+  VERSION = Gem::Version.new('0.1.4.pre')
 end

data/lib/czmq/zconfig.rb

@@ -11,16 +11,16 @@ module CZMQ
     czmq_function :value,             :value,       [:pointer],                     :string
     czmq_function :put,               :put,         [:pointer, :string, :string],   :void
     czmq_function :set_name,          :set_name,    [:pointer, :string],            :void
-    czmq_function :set_value,         :set_value,   [:pointer, :string],            :void
+    czmq_function :set_value,         :set_value,   [:pointer, :string, :varargs],  :void
     czmq_function :child_zconfig,     :child,       [:pointer],                     :pointer
     czmq_function :next_zconfig,      :next,        [:pointer],                     :pointer
     czmq_function :locate_zconfig,    :locate,      [:pointer, :string],            :pointer
     czmq_function :resolve,           :resolve,     [:pointer, :string, :string],   :string
     czmq_function :zconfig_at_depth,  :at_depth,    [:pointer, :int],               :pointer
     czmq_function :execute_zconfig,   :execute,     [:pointer, :pointer, :pointer], :int
-    czmq_function :set_comment,       :set_comment, [:pointer, :string],            :void
+    czmq_function :set_comment,       :set_comment, [:pointer, :string, :varargs],  :void
     czmq_function :load_zconfig,      :load,        [:string],                      :pointer
-    czmq_function :save_zconfig,      :save,        [:pointer, :string],            :int
+    czmq_function :save,              :save,        [:pointer, :string],            :int
     czmq_function :filename,          :filename,    [:pointer],                     :string
     czmq_function :reload,            :reload,      [:pointer],                     :int
     czmq_function :has_changed,       :has_changed, [:pointer],                     :bool
@@ -34,11 +34,15 @@ module CZMQ
     end
 
     def child
-      self.class.new_from_czmq_obj(child_zconfig, nil)
+      unless (child_config = child_zconfig).null?
+        self.class.new_from_czmq_obj(child_zconfig, nil)
+      end
     end
 
     def next
-      self.class.new_from_czmq_obj(next_zconfig, nil)
+      unless (next_config = next_zconfig).null?
+        self.class.new_from_czmq_obj(next_zconfig, nil)
+      end
     end
 
     def execute(&block)
@@ -53,16 +57,12 @@ module CZMQ
     def locate(path)
       unless (zconfig = locate_zconfig(path)).null?
         self.class.new_from_czmq_obj(zconfig, nil)
-      else
-        fail RuntimeError, Utils.error, caller
       end
     end
 
     def at_depth(level)
       unless (zconfig = zconfig_at_depth(level)).null?
         self.class.new_from_czmq_obj(zconfig, nil)
-      else
-        fail RuntimeError, Utils.error, caller
       end
     end
   end

data/lib/czmq/zmsg.rb

@@ -30,7 +30,7 @@ module CZMQ
     czmq_function :next_zframe,       :next,          [:pointer],                       :pointer
     czmq_function :last_zframe,       :last,          [:pointer],                       :pointer
     czmq_function :encode_zmsg,       :encode,        [:pointer, :buffer_out],          :size_t
-    czmq_function :decode_zmsg,       :decode,        [:pointer, :size_t],              :pointer
+    czmq_function :decode_zmsg,       :decode,        [:buffer_in, :size_t],            :pointer
     czmq_function :dup_zmsg,          :dup,           [:pointer],                       :pointer
     czmq_function :print,             :print,         [:pointer],                       :void
 

data/lib/czmq/zsock.rb

@@ -5,23 +5,23 @@ require_relative 'zmsg'
 
 module CZMQ
   class Zsock
-    SET_SOCKOPT = /^set_(.+)$/.freeze
+    SET_SOCKOPT = 'set_'.freeze
 
     extend ::LibCZMQ
 
     czmq_constructor
     czmq_destructor
 
-    czmq_function :bind,        :bind,      [:pointer, :string],        :int
-    czmq_function :endpoint,    :endpoint,  [:pointer],                 :string
-    czmq_function :unbind,      :unbind,    [:pointer, :string],        :int
-    czmq_function :connect,     :connect,   [:pointer, :string],        :int
-    czmq_function :disconnect,  :disconnect,[:pointer, :string],        :int
-    czmq_function :attach,      :attach,    [:pointer, :string, :bool], :int
-    czmq_function :type_str,    :type_str,  [:pointer],                 :string
-    czmq_function :signal,      :signal,    [:pointer, :uchar],         :int
-    czmq_function :wait,        :wait,      [:pointer],                 :int
-    czmq_function :resolve,     :resolve,   [:pointer],                 :pointer
+    czmq_function :bind,        :bind,      [:pointer, :string, :varargs],  :int
+    czmq_function :endpoint,    :endpoint,  [:pointer],                     :string
+    czmq_function :unbind,      :unbind,    [:pointer, :string, :varargs],  :int
+    czmq_function :connect,     :connect,   [:pointer, :string],            :int
+    czmq_function :disconnect,  :disconnect,[:pointer, :string],            :int
+    czmq_function :attach,      :attach,    [:pointer, :string, :bool],     :int
+    czmq_function :type_str,    :type_str,  [:pointer],                     :string
+    czmq_function :signal,      :signal,    [:pointer, :uchar],             :int
+    czmq_function :wait,        :wait,      [:pointer],                     :int
+    czmq_function :resolve,     :resolve,   [:pointer],                     :pointer
 
     def self.convert(czmq_obj)
       if Utils.check_for_pointer(czmq_obj)
@@ -85,7 +85,7 @@ module CZMQ
 
     def method_missing(meth, *args, &blk)
       if args.length == 1 &&
-         meth.to_s =~ SET_SOCKOPT &&
+         meth.to_s.start_with?(SET_SOCKOPT) &&
          (args.first.is_a?(Fixnum) || args.first.is_a?(String))
         begin
 

data/lib/czmq/zstr.rb

@@ -10,7 +10,7 @@ module CZMQ
     czmq_function :send_zstr,  :send,  [:pointer, :string],               :int
     czmq_function :sendm,      :sendm, [:pointer, :string],               :int
     czmq_function :sendx_zstr, :sendx, [:pointer, :string, :varargs],     :int
-    czmq_function :recvx_zsrt, :recvx, [:pointer, :buffer_out, :varargs], :int
+    czmq_function :recvx_zstr, :recvx, [:pointer, :buffer_out, :varargs], :int
     czmq_function :free,       :free,  [:pointer],                        :void
 
     class << self
@@ -47,7 +47,7 @@ module CZMQ
           buffers << FFI::Buffer.new_out(:pointer)
         end
 
-        recvx_zsrt(Zsock.convert(socket), *buffers, :pointer, nil)
+        recvx_zstr(Zsock.convert(socket), *buffers, :pointer, nil)
 
         strings = []
         buffers.select {|buffer| buffer != :buffer_out}.each do |buffer|

data/lib/czmq.rb

@@ -14,3 +14,4 @@ require_relative 'czmq/ziflist'
 require_relative 'czmq/zconfig'
 require_relative 'czmq/zstr'
 require_relative 'czmq/zclock'
+require_relative 'libzmq'

data/lib/ffi-czmq.rb

@@ -14,3 +14,4 @@ require_relative 'czmq/ziflist'
 require_relative 'czmq/zconfig'
 require_relative 'czmq/zstr'
 require_relative 'czmq/zclock'
+require_relative 'libzmq'

data/lib/libzmq.rb

@@ -2,7 +2,7 @@
 
 module Libzmq
   extend FFI::Library
-  ffi_lib :libzmq, FFI::Library::LIBC
+  ffi_lib :libzmq
 
   POLLIN  = 1
   POLLOUT = 2
@@ -32,9 +32,15 @@ module Libzmq
     def error?
       (self[:revents] & POLLERR) > 0
     end
+
+    def priority?
+      (self[:revents] & POLLPRI) > 0
+    end
   end
 
-  attach_function  :poll, :zmq_poll,  [:pointer, :int, :long], :int,  blocking: true
+  attach_function :poll, :zmq_poll, [:pointer, :int, :long],            :int,     blocking: true
+  attach_function :zmq_z85_decode,  [:buffer_out, :string],             :pointer, blocking: true
+  attach_function :zmq_z85_encode,  [:buffer_out, :buffer_in, :size_t], :string,  blocking: true
 
   class PollItems < Array
     def to_ptr
@@ -47,4 +53,22 @@ module Libzmq
       items_pointer
     end
   end
+
+  module_function
+
+  def z85_decode(str)
+    if (str.bytesize % 5 == 0)
+      buffer = FFI::MemoryPointer.new(:uint8, (str.bytesize * 0.8))
+      zmq_z85_decode(buffer, str)
+      buffer
+    end
+  end
+
+  def z85_encode(data)
+    size = data.respond_to?(:bytesize) ? data.bytesize : data.size
+    if (size % 4 == 0)
+      buffer = FFI::MemoryPointer.new(:char, (size * 1.25) + 1)
+      zmq_z85_encode(buffer, data, size)
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ffi-czmq
 version: !ruby/object:Gem::Version
-  version: 0.1.3.pre
+  version: 0.1.4.pre
 platform: ruby
 authors:
 - Hendrik
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-07 00:00:00.000000000 Z
+date: 2014-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi