ffi-rzmq 0.8.0 → 0.8.2

data/AUTHORS.txt

@@ -0,0 +1,18 @@
+Chuck Remes, github: chuckremes
+
+Andrew Cholakian, github: andrewvc
+
+Ar Vicco, github: arvicco
+
+Ben Mabey, github: bmabey
+
+Julien Ammous, github: schmurfy
+
+Zachary Belzer, github: zbelzer
+
+Cory Forsyth, github: bantic
+
+Stefan Kaes, github: skaes
+
+Dmitry Ustalov, github: eveel
+

data/History.txt

@@ -1,3 +1,17 @@
+== 0.8.2 / 20110728
+  * Fixed major bug with Socket#setsockopt when writing 8-byte longs.
+
+  * Clarified a bit of logic for non-blocking sends.
+
+  * Improved readability of exceptions.
+
+== 0.8.1 / 20110504
+  * Fixed bug where Socket#setsockopt was using a size from the current
+    runtime to determine how many bytes to use for HWM, et al. This was
+    incorrect. All of those socket options require 8 bytes. Discovered
+    this while getting the code running under mingw on Windows using a
+    32-bit Ruby runtime.
+
 == 0.8.0 / 20110307
   * API change!
     Socket#send_message no longer automatically calls

data/README.rdoc

@@ -32,11 +32,7 @@ The 'ffi' gem has dropped support for MRI 1.8.x. Since this project relies
 on that gem to load and run this code, then this project also no longer
 supports MRI 1.8.x. 
 
-All features are implemented with the exception of the 0mq devices
-(forwarder, queue, streamer). For implementations of these devices, see
-the 0mq Ruby reactor project:
-
-  http://github.com/chuckremes/zmqmachine
+All features are implemented.
 
 == SYNOPSIS:
 
@@ -111,6 +107,8 @@ I highly recommend visiting the Learn Ruby 0mq project for a bunch of good code
 The ZeroMQ library must be installed on your system in a well-known location
 like /usr/local/lib. This is the default for new ZeroMQ installs.
 
+If you have installed ZeroMQ using brew, you need to `brew link zeromq` before installing this gem.
+
 Future releases may include the library as a C extension built at
 time of installation.
 

data/ffi-rzmq.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ffi-rzmq}
-  s.version = "0.8.0"
+  s.version = "0.8.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chuck Remes"]
@@ -12,7 +12,7 @@ function interface). It's a pure ruby wrapper so this gem can be loaded
 and run by any ruby runtime that supports FFI. That's all of them:
 MRI 1.9.x, Rubinius and JRuby.}
   s.email = %q{cremes@mac.com}
-  s.extra_rdoc_files = ["History.txt", "README.rdoc", "examples/README.rdoc", "version.txt"]
+  s.extra_rdoc_files = ["AUTHORS.txt", "History.txt", "README.rdoc", "examples/README.rdoc", "version.txt"]
   s.files = [".bnsignore", "History.txt", "README.rdoc", "Rakefile", "examples/README.rdoc", "examples/local_lat.rb", "examples/local_lat_poll.rb", "examples/local_lat_zerocopy.rb", "examples/local_throughput.rb", "examples/publish_subscribe.rb", "examples/remote_lat.rb", "examples/remote_lat_zerocopy.rb", "examples/remote_throughput.rb", "examples/reqrep_poll.rb", "examples/request_response.rb", "ffi-rzmq.gemspec", "lib/ffi-rzmq.rb", "lib/ffi-rzmq/context.rb", "lib/ffi-rzmq/device.rb", "lib/ffi-rzmq/exceptions.rb", "lib/ffi-rzmq/message.rb", "lib/ffi-rzmq/poll.rb", "lib/ffi-rzmq/poll_items.rb", "lib/ffi-rzmq/socket.rb", "lib/ffi-rzmq/wrapper.rb", "lib/ffi-rzmq/zmq.rb", "spec/context_spec.rb", "spec/device_spec.rb", "spec/message_spec.rb", "spec/pushpull_spec.rb", "spec/reqrep_spec.rb", "spec/socket_spec.rb", "spec/spec_helper.rb", "version.txt"]
   s.homepage = %q{http://github.com/chuckremes/ffi-rzmq}
   s.rdoc_options = ["--main", "README.rdoc"]

data/lib/ffi-rzmq/exceptions.rb

@@ -8,7 +8,7 @@ module ZMQ
       @source = source
       @result_code = result_code
       @error_code = error_code
-      @message = message
+      @message = "msg [#{message}], error code [#{error_code}], rc [#{result_code}]"
       super message
     end
   end # call ZeroMQError

data/lib/ffi-rzmq/message.rb

@@ -93,7 +93,6 @@ module ZMQ
       # the memory; it's pointless work since the library is going to
       # overwrite it anyway.
       @pointer = FFI::MemoryPointer.new LibZMQ::Msg.size, 1, false
-      @struct = LibZMQ::Msg.new @pointer
 
       if message
         copy_in_string message

data/lib/ffi-rzmq/poll.rb

@@ -142,6 +142,9 @@ module ZMQ
 #    end
     def delete sock
       removed = false
+      deregister_readable sock
+      deregister_writable sock
+      
       size = @sockets.size
       @sockets.delete_if { |socket| socket.socket.address == sock.socket.address }
       socket_deleted = size != @sockets.size

data/lib/ffi-rzmq/socket.rb

@@ -84,13 +84,13 @@ module ZMQ
     #
     def setsockopt option_name, option_value, option_len = nil
       option_value = sanitize_value option_name, option_value
-      option_len ||= option_value.size
 
       begin
         case option_name
         when HWM, SWAP, AFFINITY, RATE, RECOVERY_IVL, MCAST_LOOP, SNDBUF, RCVBUF, RECOVERY_IVL_MSEC
+          option_len = 8 # all of these options are defined as int64_t or uint64_t
           option_value_ptr = LibC.malloc option_len
-          option_value_ptr.write_long option_value
+          option_value_ptr.write_long_long option_value
 
         when LINGER, RECONNECT_IVL, BACKLOG
           option_len = 4 # hard-code "int" length to 4 bytes
@@ -98,6 +98,8 @@ module ZMQ
           option_value_ptr.write_int option_value
 
         when IDENTITY, SUBSCRIBE, UNSUBSCRIBE
+          option_len ||= option_value.size
+
           # note: not checking errno for failed memory allocations :(
           option_value_ptr = LibC.malloc option_len
           option_value_ptr.write_string option_value
@@ -147,7 +149,7 @@ module ZMQ
         option_length = FFI::MemoryPointer.new(:size_t) rescue FFI::MemoryPointer.new(:ulong)
 
         unless [
-          RCVMORE, HWM, SWAP, AFFINITY, RATE, RECOVERY_IVL, MCAST_LOOP, IDENTITY,
+          TYPE, RCVMORE, HWM, SWAP, AFFINITY, RATE, RECOVERY_IVL, MCAST_LOOP, IDENTITY,
           SNDBUF, RCVBUF, FD, EVENTS, LINGER, RECONNECT_IVL, BACKLOG, RECOVERY_IVL_MSEC
         ].include? option_name
         # we didn't understand the passed option argument
@@ -167,7 +169,7 @@ module ZMQ
         ret = option_value.read_long_long != 0
       when HWM, SWAP, AFFINITY, RATE, RECOVERY_IVL, SNDBUF, RCVBUF, RECOVERY_IVL_MSEC
         ret = option_value.read_long_long
-      when LINGER, RECONNECT_IVL, BACKLOG, FD, EVENTS
+      when TYPE, LINGER, RECONNECT_IVL, BACKLOG, FD, EVENTS
         ret = option_value.read_int
       when IDENTITY
         ret = option_value.read_string(option_length.read_long_long)
@@ -257,7 +259,7 @@ module ZMQ
 
       # when the flag isn't set, do a normal error check
       # when set, check to see if the message was successfully queued
-      queued = flags != NOBLOCK ? error_check(ZMQ_SEND_STR, result_code) : error_check_nonblock(result_code)
+      queued = noblock?(flags) ? error_check_nonblock(result_code) : error_check(ZMQ_SEND_STR, result_code)
     end
 
     # true if sent, false if failed/EAGAIN
@@ -280,7 +282,25 @@ module ZMQ
 
     result_code
   end
-  
+
+  # Send a sequence of strings as a multipart message out of the +parts+
+  # passed in for transmission. Every element of +parts+ should be
+  # a String.
+  #
+  # +flags+ may be ZMQ::NOBLOCK.
+  #
+  # Raises the same exceptions as Socket#send.
+  #
+  def send_strings parts, flags = 0
+    return false if !parts || parts.empty?
+
+    parts[0...-1].each do |part|
+      return false unless send_string part, flags | ZMQ::SNDMORE
+    end
+
+    send_string parts[-1], flags
+  end
+
   # Sends a message. This will automatically close the +message+ for both successful
   # and failed sends.
   #
@@ -355,6 +375,19 @@ module ZMQ
     end
   end
 
+  # Receive a multipart message as a list of strings.
+  #
+  # +flags+ may be ZMQ::NOBLOCK.
+  #
+  # Raises the same exceptions as Socket#recv.
+  #
+  def recv_strings flags = 0
+    parts = []
+    parts << recv_string(flags)
+    parts << recv_string(flags) while more_parts?
+    parts
+  end
+
   private
   
   def noblock? flag
@@ -385,7 +418,7 @@ module ZMQ
       end
       @sockopt_cache[:int64]
 
-    when LINGER, RECONNECT_IVL, BACKLOG, FD, EVENTS
+    when TYPE, LINGER, RECONNECT_IVL, BACKLOG, FD, EVENTS
       # int, 0mq assumes int is 4-bytes
       unless @sockopt_cache[:int32]
         length = FFI::MemoryPointer.new :int32

data/lib/ffi-rzmq/wrapper.rb

@@ -21,11 +21,9 @@ end # module LibC
 
 module LibZMQ
   extend FFI::Library
-  LINUX = ["libzmq", "/usr/local/lib/libzmq", "/usr/local/lib/libzmq.so", "/opt/local/lib/libzmq"]
-  OSX = ["libzmq", "/usr/local/lib/libzmq", "/opt/local/lib/libzmq"]
-  WINDOWS = []
-  ffi_lib(LINUX + OSX + WINDOWS)
-  
+  ZMQ_LIB_PATHS = %w{/usr/local/lib /opt/local/lib /usr/local/homebrew/lib}.map{|path| "#{path}/libzmq.#{FFI::Platform::LIBSUFFIX}"}
+  ffi_lib(%w{libzmq} + ZMQ_LIB_PATHS)
+
   # Size_t not working properly on Windows
   find_type(:size_t) rescue typedef(:ulong, :size_t)
 
@@ -78,7 +76,7 @@ module LibZMQ
   attach_function :zmq_recv, [:pointer, :pointer, :int], :int
   attach_function :zmq_close, [:pointer], :int
 
-  #experimental zmq_devices support
+  @blocking = true
   attach_function :zmq_device, [:int, :pointer, :pointer], :int
   
   # Poll api

data/lib/ffi-rzmq/zmq.rb

@@ -1,4 +1,3 @@
-
 module ZMQ
 
   #  Socket types
@@ -7,8 +6,8 @@ module ZMQ
   SUB = 2
   REQ = 3
   REP = 4
-  ROUTER = XREQ = 5
-  DEALER = XREP = 6
+  DEALER = XREQ = 5
+  ROUTER = XREP = 6
   PULL = UPSTREAM = 7
   PUSH = DOWNSTREAM = 8
 
@@ -176,7 +175,7 @@ module ZMQ
 
     def raise_error source, result_code
       case source
-      when ZMQ_SEND_STR, ZMQ_RECV_STR, ZMQ_SOCKET_STR, ZMQ_SETSOCKOPT_STR, ZMQ_GETSOCKOPT_STR, ZMQ_BIND_STR, ZMQ_CONNECT_STR
+      when ZMQ_SEND_STR, ZMQ_RECV_STR, ZMQ_SOCKET_STR, ZMQ_SETSOCKOPT_STR, ZMQ_GETSOCKOPT_STR, ZMQ_BIND_STR, ZMQ_CONNECT_STR, ZMQ_CLOSE_STR
         raise SocketError.new source, result_code, errno, error_string
       when ZMQ_INIT_STR, ZMQ_TERM_STR
         raise ContextError.new source, result_code, errno, error_string

data/spec/device_spec.rb

@@ -15,6 +15,7 @@ module ZMQ
         front.bind(@front_addr)
         Device.new(ZMQ::STREAMER, back, front)
       end
+      sleep 0.5
     end
     
     it "should create a streamer device without error given valid opts" do

data/spec/socket_spec.rb

@@ -391,6 +391,12 @@ module ZMQ
             socket.getsockopt(ZMQ::EVENTS).should be_a(Fixnum)
           end
         end
+
+        context "using option ZMQ::TYPE" do
+          it "should return the socket type" do
+            socket.getsockopt(ZMQ::TYPE).should == socket_type
+          end
+        end
       end # context #getsockopt
 
     end # each socket_type

data/version.txt

@@ -1 +1 @@
-0.8.0
+0.8.2

metadata

@@ -1,16 +1,11 @@
 --- !ruby/object:Gem::Specification 
 name: ffi-rzmq
 version: !ruby/object:Gem::Version 
-  hash: 63
   prerelease: 
-  segments: 
-  - 0
-  - 8
-  - 0
-  version: 0.8.0
+  version: 0.8.2
 platform: ruby
 authors: 
-- Chuck Remes
+  - Chuck Remes
 autorequire: 
 bindir: bin
 cert_chain: []
@@ -18,22 +13,17 @@ cert_chain: []
 date: 2011-01-30 00:00:00 -06:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: bones
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 3
-        - 5
-        - 4
-        version: 3.5.4
-  type: :development
-  version_requirements: *id001
+  - !ruby/object:Gem::Dependency 
+    name: bones
+    prerelease: false
+    requirement: &id001 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: 3.5.4
+    type: :development
+    version_requirements: *id001
 description: |-
   This gem wraps the ZeroMQ networking library using the ruby FFI (foreign
   function interface). It's a pure ruby wrapper so this gem can be loaded
@@ -45,77 +35,73 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- History.txt
-- README.rdoc
-- examples/README.rdoc
-- version.txt
+  - AUTHORS.txt
+  - History.txt
+  - README.rdoc
+  - examples/README.rdoc
+  - version.txt
 files: 
-- .bnsignore
-- History.txt
-- README.rdoc
-- Rakefile
-- examples/README.rdoc
-- examples/local_lat.rb
-- examples/local_lat_poll.rb
-- examples/local_lat_zerocopy.rb
-- examples/local_throughput.rb
-- examples/publish_subscribe.rb
-- examples/remote_lat.rb
-- examples/remote_lat_zerocopy.rb
-- examples/remote_throughput.rb
-- examples/reqrep_poll.rb
-- examples/request_response.rb
-- ffi-rzmq.gemspec
-- lib/ffi-rzmq.rb
-- lib/ffi-rzmq/context.rb
-- lib/ffi-rzmq/device.rb
-- lib/ffi-rzmq/exceptions.rb
-- lib/ffi-rzmq/message.rb
-- lib/ffi-rzmq/poll.rb
-- lib/ffi-rzmq/poll_items.rb
-- lib/ffi-rzmq/socket.rb
-- lib/ffi-rzmq/wrapper.rb
-- lib/ffi-rzmq/zmq.rb
-- spec/context_spec.rb
-- spec/device_spec.rb
-- spec/message_spec.rb
-- spec/pushpull_spec.rb
-- spec/reqrep_spec.rb
-- spec/socket_spec.rb
-- spec/spec_helper.rb
-- version.txt
+  - .bnsignore
+  - History.txt
+  - README.rdoc
+  - Rakefile
+  - examples/README.rdoc
+  - examples/local_lat.rb
+  - examples/local_lat_poll.rb
+  - examples/local_lat_zerocopy.rb
+  - examples/local_throughput.rb
+  - examples/publish_subscribe.rb
+  - examples/remote_lat.rb
+  - examples/remote_lat_zerocopy.rb
+  - examples/remote_throughput.rb
+  - examples/reqrep_poll.rb
+  - examples/request_response.rb
+  - ffi-rzmq.gemspec
+  - lib/ffi-rzmq.rb
+  - lib/ffi-rzmq/context.rb
+  - lib/ffi-rzmq/device.rb
+  - lib/ffi-rzmq/exceptions.rb
+  - lib/ffi-rzmq/message.rb
+  - lib/ffi-rzmq/poll.rb
+  - lib/ffi-rzmq/poll_items.rb
+  - lib/ffi-rzmq/socket.rb
+  - lib/ffi-rzmq/wrapper.rb
+  - lib/ffi-rzmq/zmq.rb
+  - spec/context_spec.rb
+  - spec/device_spec.rb
+  - spec/message_spec.rb
+  - spec/pushpull_spec.rb
+  - spec/reqrep_spec.rb
+  - spec/socket_spec.rb
+  - spec/spec_helper.rb
+  - version.txt
+  - AUTHORS.txt
 has_rdoc: true
 homepage: http://github.com/chuckremes/ffi-rzmq
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --main
-- README.rdoc
+  - --main
+  - README.rdoc
 require_paths: 
-- lib
+  - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
 requirements: []
 
 rubyforge_project: ffi-rzmq
-rubygems_version: 1.5.2
+rubygems_version: 1.5.1
 signing_key: 
 specification_version: 3
 summary: This gem wraps the ZeroMQ networking library using the ruby FFI (foreign function interface).