ffi-czmq 0.0.8.pre → 0.0.9.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ee32b12e0f81bc60c2dd069a43e1bc86644f296
-  data.tar.gz: f3ec35a8b9254d33e36ca0b0d2fac0b8423c9126
+  metadata.gz: 6d7bc5dbfbbab88b01da91de2d64910c29d5230e
+  data.tar.gz: 996a30caf32c11dd341ecda967bcfdb1a44766dd
 SHA512:
-  metadata.gz: 834505429bdbc0b2d363d844e6c60fe80c72c50586187e2a173462b92065d630b6aa7f64d5ea7b90e2d7ccda82e4a0cd2e763b1fc19c955dbc90548b5db4bd0b
-  data.tar.gz: da136c3aaf401986566335ffe508aef85f20e3ec00eb9d49103fde2758c3eab8f2b4395e5026a2ba64035851ce60b4d14a7f611a72231d52a99b4878792a8bd5
+  metadata.gz: 0247ce7e0940e2ab8661e98935a8bcc780c7362bfa6a8878db03c21aa84e542230f3679f3d6d730aedf2b78a3c502348b34371e4a0433e6500ee7025af219b6a
+  data.tar.gz: 15a1dc2f33b43609b1657773ed649848530ab6e8d76cc8fafeca0d378ede15b054a2250a7f64631d6130d7232cc7010b4b081cbc46352493b51dedf9b51d3062

data/lib/czmq/libczmq.rb

@@ -56,7 +56,7 @@ module LibCZMQ
         czmq_obj = instance.class.constructor(*args)
       end
 
-      !czmq_obj.null? ||fail(RuntimeError, "Cannot allocate #{czmq_class} because of #{CZMQ::Utils.error}", caller)
+      !czmq_obj.null? ||fail(NoMemoryError, "Cannot allocate #{czmq_class} because of #{CZMQ::Utils.error}", caller)
 
       instance.instance_variable_set(:@czmq_obj, czmq_obj)
       instance.instance_variable_set(:@owned_by_ruby, true)
@@ -183,7 +183,7 @@ module LibCZMQ
 
       case #{returns.inspect}
       when :pointer
-        !result.null? ||fail(RuntimeError, CZMQ::Utils.error, caller)
+        !result.null? ||fail(NoMemoryError, CZMQ::Utils.error, caller)
         result
       when :int
         case #{function.inspect}

data/lib/czmq/utils.rb

@@ -12,44 +12,44 @@ module CZMQ
     attach_function :errno,         :zmq_errno,       [],                                   :int,     blocking: true
     attach_function :strerror,      :zmq_strerror,    [:int],                               :string,  blocking: true
 
-    class << self
-      def version
-        unless @version
-          z_major = FFI::MemoryPointer.new :int
-          z_minor = FFI::MemoryPointer.new :int
-          z_patch = FFI::MemoryPointer.new :int
-
-          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
-
-          @version = {
-             zmq: {major: z_major.read_int, minor: z_minor.read_int, patch: z_patch.read_int},
-            czmq: {major: c_major.read_int, minor: c_minor.read_int, patch: c_patch.read_int}
-          }
-        end
-
-        @version
-      end
+    module_function
 
-      def check_for_pointer(ptr)
-        ptr.is_a?(FFI::Pointer) && !ptr.null?
-      end
+    def version
+      unless @version
+        z_major = FFI::MemoryPointer.new :int
+        z_minor = FFI::MemoryPointer.new :int
+        z_patch = FFI::MemoryPointer.new :int
 
-      def error
-        strerror(errno)
-      end
+        c_major = FFI::MemoryPointer.new :int
+        c_minor = FFI::MemoryPointer.new :int
+        c_patch = FFI::MemoryPointer.new :int
 
-      def bin2hex(bytes)
-        bytes.to_str.unpack(HEXY).first
-      end
+        zmq_version  z_major, z_minor, z_patch
+        zsys_version c_major, c_minor, c_patch
 
-      def hex2bin(hex)
-        [hex].pack(HEXY)
+        @version = {
+           zmq: {major: z_major.read_int, minor: z_minor.read_int, patch: z_patch.read_int},
+          czmq: {major: c_major.read_int, minor: c_minor.read_int, patch: c_patch.read_int}
+        }
       end
+
+      @version
+    end
+
+    def check_for_pointer(ptr)
+      ptr.is_a?(FFI::Pointer) && !ptr.null?
+    end
+
+    def error
+      strerror(errno)
+    end
+
+    def bin2hex(bytes)
+      bytes.to_str.unpack(HEXY).first
+    end
+
+    def hex2bin(hex)
+      [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.0.8.pre')
+  VERSION = Gem::Version.new('0.0.9.pre')
 end

data/lib/czmq/zstr.rb

@@ -0,0 +1,65 @@
+require_relative 'libczmq'
+require_relative 'utils'
+require_relative 'zsock'
+
+module CZMQ
+  class Zstr
+    extend ::LibCZMQ
+
+    czmq_function :recv_zstr,  :recv,  [:pointer],                        :pointer
+    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 :free,       :free,  [:pointer],                        :void
+
+    class << self
+      def read_string(str_ptr)
+        if Utils.check_for_pointer(str_ptr)
+          str = str_ptr.read_string
+          free_ptr = FFI::MemoryPointer.new(:pointer)
+          free_ptr.write_pointer(str_ptr)
+          free(free_ptr)
+          str
+        else
+          fail ArgumentError, "#{str_ptr.class} is not a FFI::Pointer", caller
+        end
+      end
+
+      def recv(socket)
+        read_string(recv_zstr(Zsock.convert(socket)))
+      end
+
+      def sendx(socket, string, *strings)
+        if strings.size == 0
+          fail ArgumentError, "Wrong number of Arguments, (2 for 3..n)", caller
+        end
+
+        strings_varargs = ([ :string ] * strings.size).zip(strings).flatten
+        sendx_zstr(Zsock.convert(socket), string, *strings_varargs, :pointer, nil)
+      end
+
+      def recvx(socket, counter = 1)
+        if counter < 1
+          fail ArgumentError, "Counter must be >= 1, got #{counter}", caller
+        end
+
+        buffers = []
+        buffers << FFI::Buffer.new_out(:pointer)
+        counter.times do
+          buffers << :buffer_out
+          buffers << FFI::Buffer.new_out(:pointer)
+        end
+
+        recvx_zsrt(Zsock.convert(socket), *buffers, :pointer, nil)
+
+        strings = []
+        buffers.select {|buffer| buffer != :buffer_out}.each do |buffer|
+          strings << buffer.read_pointer.read_string
+          free(buffer)
+        end
+        strings
+      end
+    end
+  end
+end

data/lib/czmq.rb

@@ -11,3 +11,4 @@ require_relative 'czmq/zcert'
 require_relative 'czmq/zcertstore'
 require_relative 'czmq/ziflist'
 require_relative 'czmq/zconfig'
+require_relative 'czmq/zstr'

data/lib/ffi-czmq.rb

@@ -11,3 +11,4 @@ require_relative 'czmq/zcert'
 require_relative 'czmq/zcertstore'
 require_relative 'czmq/ziflist'
 require_relative 'czmq/zconfig'
+require_relative 'czmq/zstr'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ffi-czmq
 version: !ruby/object:Gem::Version
-  version: 0.0.8.pre
+  version: 0.0.9.pre
 platform: ruby
 authors:
 - Hendrik
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-09 00:00:00.000000000 Z
+date: 2014-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -62,6 +62,7 @@ files:
 - lib/czmq/zmsg.rb
 - lib/czmq/zpoller.rb
 - lib/czmq/zsock.rb
+- lib/czmq/zstr.rb
 - lib/czmq/zsys.rb
 - lib/ffi-czmq.rb
 homepage: https://github.com/Asmod4n/ruby-ffi-czmq