ffi-rzmq-core 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86300669439c93ba578f5881c11424212c0bf4c3
-  data.tar.gz: b1fcf73bc95b550ba24a31526bbb73ebbcbf904b
+  metadata.gz: 98e134276e0884d8a3f29f6101865d65342610c2
+  data.tar.gz: 675f38dd32ae51a1eab313d9c280b1e6e0235773
 SHA512:
-  metadata.gz: 79d942c1e43d2d400c3df06bcc7b63f8016b36d736f936216b564dc6e66b9086c29483ebd474630776722004ac032aeea32d617f7e2c1025170dadd3f272de0d
-  data.tar.gz: 7747c57e3458664a3801aa55d09abbf61de1e0904316cb6b069eb29206bc4ce874a6853ce92c21a33cd295631fccd0119dc97ad141aab144467c60c7c4606226
+  metadata.gz: 863dfbb8ecf92defec732741ffd09965354a5f7db1c21bd7e5ff10aad9db10881598714b56ce1c27383b375a2ca3c05ba018c643a0072ab7b80600627d0aa86a
+  data.tar.gz: 7d30013ba89544d3e7276fd998923b89fc4bb33c67830c62266068537957a81520ddc35febd9e9b01774ec3cdc89ab76e6ed93b838561f27bd69515064832bdb

data/ffi-rzmq-core.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency "ffi", ["~> 1.9"]
-  s.add_development_dependency "rspec", ["~> 2.14"]
+  s.add_runtime_dependency "ffi"
+  s.add_development_dependency "rspec"
   s.add_development_dependency "rake"
 end

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

@@ -1,4 +1,5 @@
 require 'open3'
+require 'rbconfig'
 
 # Wraps the libzmq library and attaches to the functions that are
 # common across the 3.2.x+ and 4.x APIs.
@@ -11,6 +12,8 @@ module LibZMQ
     # to the usual system paths
     inside_gem = File.join(File.dirname(__FILE__), '..', '..', 'ext')
     local_path = FFI::Platform::IS_WINDOWS ? ENV['PATH'].split(';') : ENV['PATH'].split(':')
+    env_path = [ ENV['ZMQ_LIB_PATH'] ].compact
+    rbconfig_path = RbConfig::CONFIG["libdir"]
     homebrew_path = nil
 
     # RUBYOPT set by RVM breaks 'brew' so we need to unset it.
@@ -31,7 +34,7 @@ module LibZMQ
     ENV['RUBYOPT'] = rubyopt
 
     # Search for libzmq in the following order...
-    ZMQ_LIB_PATHS = ([inside_gem] + local_path + [
+    ZMQ_LIB_PATHS = ([inside_gem] + env_path + local_path + [rbconfig_path] + [
                        '/usr/local/lib', '/opt/local/lib', homebrew_path, '/usr/lib64'
     ]).compact.map{|path| "#{path}/libzmq.#{FFI::Platform::LIBSUFFIX}"}
     ffi_lib(ZMQ_LIB_PATHS + %w{libzmq})

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

@@ -1,23 +1,51 @@
 module LibZMQ
 
-  # Used for casting pointers back to the msg_t struct
-  #
-  class Message < FFI::Struct
-    layout :content,  :pointer,
-      :flags,    :uint8,
-      :vsm_size, :uint8,
-      :vsm_data, [:uint8, 30]
+  def self.version_number
+    10000 * version[:major] + 100 * version[:minor] + version[:patch]
+  end
+
+  def self.version_string
+    "%d.%d.%d" % version.values_at(:major, :minor, :patch)
   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
+
+  raise "zmq library version not supported: #{version_string}" if version_number < 030200
+
+  # here are the typedefs for zmsg_msg_t for all known releases of libzmq
+  # grep 'typedef struct zmq_msg_t'  */include/zmq.h
+  # zeromq-3.2.2/include/zmq.h:typedef struct zmq_msg_t {unsigned char _ [32];} zmq_msg_t;
+  # zeromq-3.2.3/include/zmq.h:typedef struct zmq_msg_t {unsigned char _ [32];} zmq_msg_t;
+  # zeromq-3.2.4/include/zmq.h:typedef struct zmq_msg_t {unsigned char _ [32];} zmq_msg_t;
+  # zeromq-3.2.5/include/zmq.h:typedef struct zmq_msg_t {unsigned char _ [32];} zmq_msg_t;
+  # zeromq-4.0.0/include/zmq.h:typedef struct zmq_msg_t {unsigned char _ [32];} zmq_msg_t;
+  # zeromq-4.0.1/include/zmq.h:typedef struct zmq_msg_t {unsigned char _ [32];} zmq_msg_t;
+  # zeromq-4.0.2/include/zmq.h:typedef struct zmq_msg_t {unsigned char _ [32];} zmq_msg_t;
+  # zeromq-4.0.3/include/zmq.h:typedef struct zmq_msg_t {unsigned char _ [32];} zmq_msg_t;
+  # zeromq-4.0.4/include/zmq.h:typedef struct zmq_msg_t {unsigned char _ [32];} zmq_msg_t;
+  # zeromq-4.0.5/include/zmq.h:typedef struct zmq_msg_t {unsigned char _ [32];} zmq_msg_t;
+  # zeromq-4.0.6/include/zmq.h:typedef struct zmq_msg_t {unsigned char _ [32];} zmq_msg_t;
+  # zeromq-4.0.7/include/zmq.h:typedef struct zmq_msg_t {unsigned char _ [32];} zmq_msg_t;
+  # zeromq-4.1.0/include/zmq.h:typedef struct zmq_msg_t {unsigned char _ [48];} zmq_msg_t;
+  # zeromq-4.1.1/include/zmq.h:typedef struct zmq_msg_t {unsigned char _ [64];} zmq_msg_t;
+  # zeromq-4.1.2/include/zmq.h:typedef struct zmq_msg_t {unsigned char _ [64];} zmq_msg_t;
+  # zeromq-4.1.3/include/zmq.h:typedef struct zmq_msg_t {unsigned char _ [64];} zmq_msg_t;
+  # zeromq-4.1.4/include/zmq.h:typedef struct zmq_msg_t {unsigned char _ [64];} zmq_msg_t;
+  # libzmq/include/zmq.h: typedef union zmq_msg_t {unsigned char _ [64]; void *p; } zmq_msg_t;
+
+  def self.size_of_zmq_msg_t
+    if version_number < 040100
+      32
+    elsif version_number < 040101
+      48
+    else
+      64
     end
-    
   end
 
+  # Declare Message with correct size and alignment
+  class Message < FFI::Union
+    layout :'_', [:uint8, LibZMQ.size_of_zmq_msg_t],
+       :p, :pointer
+  end
 
   # Create the basic mapping for the poll_item_t structure so we can
   # access those fields via Ruby.

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

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

data/spec/spec_helper.rb

@@ -2,7 +2,6 @@ require File.expand_path(
 File.join(File.dirname(__FILE__), %w[.. lib ffi-rzmq-core]))
 
 require 'rspec'
-require 'rspec/autorun'
 
 Dir[File.join(File.dirname(__FILE__), "support", "*.rb")].each do |support|
   require support

data/spec/structures_spec.rb

@@ -2,23 +2,24 @@ require 'spec_helper'
 
 describe LibZMQ do
 
-  if LibZMQ.version4? && LibZMQ.version[:minor] > 0
+  if LibZMQ.version_number >= 040101
 
     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
+
+  elsif LibZMQ.version_number < 040100
+
+    it "the msg_t struct wrapped in Message is 32 bytes" do
+      LibZMQ::Message.size == 32
+    end
+
+  elsif LibZMQ.version_number == 040100
+
+    it "the msg_t struct wrapped in Message is 48 bytes" do
+      LibZMQ::Message.size == 32
     end
-    
+
   end
 
   it "wraps poll_item_t in a PollItem" do

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: ffi-rzmq-core
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Chuck Remes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-28 00:00:00.000000000 Z
+date: 2016-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement