ffi-rzmq-core 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aaef58251b0eb71a09de2e6614a728051abc6c01
-  data.tar.gz: 7b77162ec56a6df2f7c0211d5473e2b1b437206f
+  metadata.gz: 86300669439c93ba578f5881c11424212c0bf4c3
+  data.tar.gz: b1fcf73bc95b550ba24a31526bbb73ebbcbf904b
 SHA512:
-  metadata.gz: b87258245ef93fd6d2d90391f42422aaea73dcae7712e24d06fb8042fe8b019fffa0db24c98d3335e59617c649cc2eaae3a913cd9c741d271f858cc8b09c0334
-  data.tar.gz: 6ee10101e4de2928aeb5804bb1a407537bf36fa0443446494d3786a3ee817adbfff716f512829f51cf5b489b520d77fd26a00984ece6f5bf573d3aa8ab510f56
+  metadata.gz: 79d942c1e43d2d400c3df06bcc7b63f8016b36d736f936216b564dc6e66b9086c29483ebd474630776722004ac032aeea32d617f7e2c1025170dadd3f272de0d
+  data.tar.gz: 7747c57e3458664a3801aa55d09abbf61de1e0904316cb6b069eb29206bc4ce874a6853ce92c21a33cd295631fccd0119dc97ad141aab144467c60c7c4606226

data/lib/ffi-rzmq-core.rb

@@ -1,8 +1,8 @@
 require 'ffi'
 require 'ffi-rzmq-core/libc'
 require 'ffi-rzmq-core/libzmq'
-require 'ffi-rzmq-core/structures'
 require 'ffi-rzmq-core/utilities'
+require 'ffi-rzmq-core/structures'
 require 'ffi-rzmq-core/constants'
 
 if LibZMQ.version4?

data/lib/ffi-rzmq-core/constants.rb

@@ -37,54 +37,72 @@ module ZMQ
   }
 
   #  Socket options
-  AFFINITY                = 4
-  IDENTITY                = 5
-  SUBSCRIBE               = 6
-  UNSUBSCRIBE             = 7
-  RATE                    = 8
-  RECOVERY_IVL            = 9
-  SNDBUF                  = 11
-  RCVBUF                  = 12
-  RCVMORE                 = 13
-  FD                      = 14
-  EVENTS                  = 15
-  TYPE                    = 16
-  LINGER                  = 17
-  RECONNECT_IVL           = 18
-  BACKLOG                 = 19
-  RECONNECT_IVL_MAX       = 21
-  MAXMSGSIZE              = 22
-  SNDHWM                  = 23
-  RCVHWM                  = 24
-  MULTICAST_HOPS          = 25
-  RCVTIMEO                = 27
-  SNDTIMEO                = 28
-  IPV4ONLY                = 31
-  LAST_ENDPOINT           = 32
-  ROUTER_MANDATORY        = 33
-  TCP_KEEPALIVE           = 34
-  TCP_KEEPALIVE_CNT       = 35
-  TCP_KEEPALIVE_IDLE      = 36
-  TCP_KEEPALIVE_INTVL     = 37
-  TCP_ACCEPT_FILTER       = 38
-  DELAY_ATTACH_ON_CONNECT = 39
-  XPUB_VERBOSE            = 40
-  ROUTER_RAW              = 41
-  IPV6                    = 42
-  MECHANISM               = 43
-  PLAIN_SERVER            = 44
-  PLAIN_USERNAME          = 45
-  PLAIN_PASSWORD          = 46
-  CURVE_SERVER            = 47
-  CURVE_PUBLICKEY         = 48
-  CURVE_SECRETKEY         = 49
-  CURVE_SERVERKEY         = 50
-  PROBE_ROUTER            = 51
-  REQ_CORRELATE           = 52
-  REQ_RELAXED             = 53
-  CONFLATE                = 54
-  ZAP_DOMAIN              = 55
-  ROUTER_HANDOVER         = 56
+  AFFINITY                 = 4
+  IDENTITY                 = 5
+  SUBSCRIBE                = 6
+  UNSUBSCRIBE              = 7
+  RATE                     = 8
+  RECOVERY_IVL             = 9
+  SNDBUF                   = 11
+  RCVBUF                   = 12
+  RCVMORE                  = 13
+  FD                       = 14
+  EVENTS                   = 15
+  TYPE                     = 16
+  LINGER                   = 17
+  RECONNECT_IVL            = 18
+  BACKLOG                  = 19
+  RECONNECT_IVL_MAX        = 21
+  MAXMSGSIZE               = 22
+  SNDHWM                   = 23
+  RCVHWM                   = 24
+  MULTICAST_HOPS           = 25
+  RCVTIMEO                 = 27
+  SNDTIMEO                 = 28
+  IPV4ONLY                 = 31
+  LAST_ENDPOINT            = 32
+  ROUTER_MANDATORY         = 33
+  TCP_KEEPALIVE            = 34
+  TCP_KEEPALIVE_CNT        = 35
+  TCP_KEEPALIVE_IDLE       = 36
+  TCP_KEEPALIVE_INTVL      = 37
+  TCP_ACCEPT_FILTER        = 38
+  DELAY_ATTACH_ON_CONNECT  = 39
+  XPUB_VERBOSE             = 40
+  ROUTER_RAW               = 41
+  IPV6                     = 42
+  MECHANISM                = 43
+  PLAIN_SERVER             = 44
+  PLAIN_USERNAME           = 45
+  PLAIN_PASSWORD           = 46
+  CURVE_SERVER             = 47
+  CURVE_PUBLICKEY          = 48
+  CURVE_SECRETKEY          = 49
+  CURVE_SERVERKEY          = 50
+  PROBE_ROUTER             = 51
+  REQ_CORRELATE            = 52
+  REQ_RELAXED              = 53
+  CONFLATE                 = 54
+  ZAP_DOMAIN               = 55
+  ROUTER_HANDOVER          = 56
+  TOS                      = 57
+  CONNECT_RID              = 61
+  GSSAPI_SERVER            = 62
+  GSSAPI_PRINCIPAL         = 63
+  GSSAPI_SERVICE_PRINCIPAL = 64
+  GSSAPI_PLAINTEXT         = 65
+  HANDSHAKE_IVL            = 66
+  SOCKS_PROXY              = 68
+  XPUB_NODROP              = 69
+  BLOCKY                   = 70
+  XPUB_MANUAL              = 71
+  XPUB_WELCOME_MSG         = 72
+  STREAM_NOTIFY            = 73
+  INVERT_MATCHING          = 74
+  HEARTBEAT_IVL            = 75
+  HEARTBEAT_TTL            = 76
+  HEARTBEAT_TIMEOUT        = 77
+  XPUB_VERBOSE_UNSUBSCRIBE = 78
 
   IMMEDIATE       = DELAY_ATTACH_ON_CONNECT
   FAIL_UNROUTABLE = ROUTER_MANDATORY

data/lib/ffi-rzmq-core/structures.rb

@@ -8,6 +8,15 @@ module LibZMQ
       :vsm_size, :uint8,
       :vsm_data, [:uint8, 30]
   end
+  
+  if LibZMQ.version[:major] >= 4 && LibZMQ.version[:minor] > 0
+    
+    # zmq_msg_t was expanded to 64 bytes as of version 4.1.0
+    class Message < FFI::Struct
+      layout :content, :ulong_long
+    end
+    
+  end
 
 
   # Create the basic mapping for the poll_item_t structure so we can

data/lib/ffi-rzmq-core/version.rb

@@ -1,3 +1,3 @@
 module LibZMQ
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

data/spec/structures_spec.rb

@@ -2,13 +2,23 @@ require 'spec_helper'
 
 describe LibZMQ do
 
-  it "wraps the msg_t struct as Message" do
-    message = LibZMQ::Message.new
+  if LibZMQ.version4? && LibZMQ.version[:minor] > 0
 
-    expect(message[:content]).to_not be_nil
-    expect(message[:flags]).to_not be_nil
-    expect(message[:vsm_size]).to_not be_nil
-    expect(message[:vsm_data]).to_not be_nil
+    it "the msg_t struct wrapped in Message is 64 bytes" do
+      LibZMQ::Message.size == 64
+    end
+    
+  else
+    
+    it "wraps the msg_t struct as Message" do
+      message = LibZMQ::Message.new
+  
+      expect(message[:content]).to_not be_nil
+      expect(message[:flags]).to_not be_nil
+      expect(message[:vsm_size]).to_not be_nil
+      expect(message[:vsm_data]).to_not be_nil
+    end
+    
   end
 
   it "wraps poll_item_t in a PollItem" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffi-rzmq-core
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Chuck Remes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-12 00:00:00.000000000 Z
+date: 2015-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -102,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: This gem provides only the FFI wrapper for the ZeroMQ (0mq) networking library.