ffi-czmq 0.1.5.pre → 0.1.6.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 444198027bcdd0c5906ffa6b56ddde5880b694b6
-  data.tar.gz: 2e4e614f95750ee43be4a7258922fdfa8a303a7b
+  metadata.gz: 23a96efb8c851990c1b881966d411b8e48aad1df
+  data.tar.gz: 51d1b99f852880126dc84a6ad2bc0d519faa0d51
 SHA512:
-  metadata.gz: 5f3c6f5ba8cfa8945ef42e27d6762acce9ecdb6a83be85db0ae05444e36cfd9249a5a854d084488d6db4d2f151a48bd8f3c0621c113efb8691e46fc4b3b3ec54
-  data.tar.gz: 5dc16ab6ac77219739be34dbf5c44eadb4b1c45a7c4a8f55c271093258027b96931fd6419f75874231719f6299685084038e1da9cbd0239a7e93b89980873a97
+  metadata.gz: 19d166c0bde022c56e4d68210c1d1f276311a0c512f80adcbde2b06b9c6a6f6876e5061aee78a9b87e7b3603fc894a9c4d5ff51eec566ab3f8ed2891ce8cecd9
+  data.tar.gz: 0384d25d02a8343f87d2d38326f73be2ed6a5bd87719d952cfb8c1e5efb4c9ae14cafaef2f2dbe9372770514c41459ca4caffabacf4289d30a798d2e4cd3d13e

data/lib/czmq/utils.rb

@@ -44,6 +44,12 @@ module CZMQ
       strerror(errno)
     end
 
+    ZERO = "\0".force_encoding(Encoding::ASCII_8BIT).freeze
+
+    def zeros(n)
+      ZERO * n
+    end
+
     def bin2hex(bytes)
       String(bytes).unpack(HEXY).first
     end

data/lib/czmq/version.rb

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

data/lib/czmq/zcert.rb

@@ -8,15 +8,20 @@ module CZMQ
     czmq_constructor
     czmq_destructor
 
-    czmq_function :public_txt,  :public_txt,  [:pointer],           :string
-    czmq_function :secret_txt,  :secret_txt,  [:pointer],           :string
-    czmq_function :load_zcert,  :load,        [:string],            :pointer
-    czmq_function :save,        :save,        [:pointer, :string],  :int
-    czmq_function :save_public, :save_public, [:pointer, :string],  :int
-    czmq_function :save_secret, :save_secret, [:pointer, :string],  :int
-    czmq_function :apply,       :apply,       [:pointer, :pointer], :void
-    czmq_function :dup_zcert,   :dup,         [:pointer],           :pointer
-    czmq_function :eq,          :eq,          [:pointer, :pointer], :bool
+    czmq_function :new_from_zcert,  :new_from,    [:buffer_in, :buffer_in],               :pointer
+    czmq_function :public_key,      :public_key,  [:pointer],                             :pointer
+    czmq_function :secret_key,      :secret_key,  [:pointer],                             :pointer
+    czmq_function :public_txt,      :public_txt,  [:pointer],                             :string
+    czmq_function :secret_txt,      :secret_txt,  [:pointer],                             :string
+    czmq_function :set_meta,        :set_meta,    [:pointer, :string, :string, :varargs], :void
+    czmq_function :meta,            :meta,        [:pointer, :string],                    :string
+    czmq_function :load_zcert,      :load,        [:string],                              :pointer
+    czmq_function :save,            :save,        [:pointer, :string],                    :int
+    czmq_function :save_public,     :save_public, [:pointer, :string],                    :int
+    czmq_function :save_secret,     :save_secret, [:pointer, :string],                    :int
+    czmq_function :apply,           :apply,       [:pointer, :pointer],                   :void
+    czmq_function :dup_zcert,       :dup,         [:pointer],                             :pointer
+    czmq_function :eq,              :eq,          [:pointer, :pointer],                   :bool
 
     def self.convert(cert)
       if Utils.check_for_pointer(cert)
@@ -31,6 +36,10 @@ module CZMQ
       end
     end
 
+    def self.new_from(public_key, secret_key)
+      new_from_czmq_obj(new_from_zcert(public_key, secret_key))
+    end
+
     def self.load(filename)
       unless (zcert = load_zcert(filename)).null?
         new_from_czmq_obj(zcert)

data/lib/czmq/zcertstore.rb

@@ -1,5 +1,5 @@
-require_relative 'utils'
-require_relative 'libczmq'
+require_relative 'libczmq'
+require_relative 'zcert'
 
 module CZMQ
   class Zcertstore
@@ -8,7 +8,16 @@ module CZMQ
     czmq_constructor [:string]
     czmq_destructor
 
-    czmq_function :lookup,        :lookup,  [:pointer, :string],  :pointer
+    czmq_function :lookup_zcert,  :lookup,  [:pointer, :string],  :pointer
     czmq_function :insert_zcert,  :insert,  [:pointer, :pointer], :void
+    czmq_function :print,         :print,   [:pointer],           :void
+
+    def lookup(public_key)
+      Zcert.new_from_czmq_obj(lookup_zcert(public_key))
+    end
+
+    def insert(zcert)
+      insert_zcert(Zcert.convert(zcert))
+    end
   end
 end

data/lib/libzmq.rb

@@ -1,4 +1,5 @@
 require 'ffi'
+require_relative 'czmq/utils'
 
 module Libzmq
   extend FFI::Library
@@ -58,17 +59,20 @@ module Libzmq
 
   def z85_decode(str)
     if (str.bytesize % 5 == 0)
-      buffer = FFI::MemoryPointer.new(:uint8, (str.bytesize * 0.8))
+      buffer = CZMQ::Utils.zeros(str.bytesize * 0.8)
       zmq_z85_decode(buffer, str)
       buffer
+    else
+      raise ArgumentError, "str=#{str} bytesize=#{str.bytesize} is not divisible by 5", caller
     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)
+      zmq_z85_encode(CZMQ::Utils.zeros(size * 1.25 + 1), data, size)
+    else
+      raise ArgumentError, "data=#{data} size=#{size} is not divisible by 4", caller
     end
   end
 end

metadata

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