ffi-rzmq 1.0.0 → 1.0.1

data/.travis.yml

@@ -1,8 +1,10 @@
+before_install: sudo apt-get install libzmq3-dev
 script: bundle exec rspec
 language: ruby
 rvm:
   - 1.9.2
   - 1.9.3
+  - 2.0.0
   - ruby-head
   - jruby-18mode
   - jruby-19mode

data/History.txt

@@ -1,3 +1,10 @@
+== 1.0.1 / 20130318
+	* Fix for issue #77 was not included in 1.0.0 release by mistake.
+	
+	* Add MIR 2.0.0 to travis runs.
+	
+	* Add support for LAST_ENDPOINT and MULTICAST_HOPS to Socket#getsockopt.
+
 == 1.0.0 / 20130109
 	*	Fix for issue #74 (send_multiple improperly handled single part messages).
 	

data/README.rdoc

@@ -9,7 +9,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.
 
-This single gem supports 0mq 2.x and 3.1.x 0mq APIs. The 0mq project started
+This single gem supports 0mq 2.2.x and 3.2.x 0mq APIs. The 0mq project started
 making backward-incompatible changes to the API with the 3.1.x release.
 The gem auto-configures itself to expose the API conforming to the loaded
 C library. 0mq API 3.0 is *not* supported; the 0mq community voted to

data/lib/ffi-rzmq/poll.rb

@@ -127,7 +127,7 @@ module ZMQ
       @poll_items.delete(pollable)
     end
 
-    def to_s inspect; end
+    def to_s; inspect; end
 
     private
 

data/lib/ffi-rzmq/socket.rb

@@ -703,7 +703,7 @@ module ZMQ
       # Disconnect the socket from the given +endpoint+.
       #
       def disconnect(endpoint)
-        LibZMQ.zmq_disconnect(endpoint)
+        LibZMQ.zmq_disconnect(socket, endpoint)
       end
       
       # Version3 only
@@ -711,7 +711,7 @@ module ZMQ
       # Unbind the socket from the given +endpoint+.
       #
       def unbind(endpoint)
-        LibZMQ.zmq_unbind(endpoint)
+        LibZMQ.zmq_unbind(socket, endpoint)
       end
 
 
@@ -731,10 +731,14 @@ module ZMQ
         # integer options
         [RECONNECT_IVL_MAX, RCVHWM, SNDHWM, RATE, RECOVERY_IVL, SNDBUF, RCVBUF, IPV4ONLY,
           ROUTER_BEHAVIOR, TCP_KEEPALIVE, TCP_KEEPALIVE_CNT,
-          TCP_KEEPALIVE_IDLE, TCP_KEEPALIVE_INTVL, TCP_ACCEPT_FILTER].each { |option| @option_lookup[option] = 0 }
-          
+          TCP_KEEPALIVE_IDLE, TCP_KEEPALIVE_INTVL, TCP_ACCEPT_FILTER, MULTICAST_HOPS
+        ].each { |option| @option_lookup[option] = 0 }
+
         # long long options
         [MAXMSGSIZE].each { |option| @option_lookup[option] = 1 }
+
+        # string options
+        [LAST_ENDPOINT].each { |option| @option_lookup[option] = 2 }
       end
 
       # these finalizer-related methods cannot live in the CommonSocketBehavior

data/lib/ffi-rzmq/version.rb

@@ -1,3 +1,3 @@
 module ZMQ
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/spec/socket_spec.rb

@@ -268,7 +268,17 @@ module ZMQ
             end
           end # context using option ZMQ::IPV4ONLY
 
-
+          context "using option ZMQ::LAST_ENDPOINT" do
+            it "should return last enpoint" do
+              random_port = bind_to_random_tcp_port(socket, max_tries = 500)
+              array = []
+              rc = socket.getsockopt(ZMQ::LAST_ENDPOINT, array)
+              ZMQ::Util.resultcode_ok?(rc).should == true
+              endpoint_regex = %r{\Atcp://(.*):(\d+)\0\z}
+              array[0].should =~ endpoint_regex
+              Integer(array[0][endpoint_regex, 2]).should == random_port
+            end
+          end
         end # version2? if/else block
 
 

data/spec/spec_helper.rb

@@ -23,14 +23,6 @@ def version3?
 end
 
 
-SLEEP_SHORT = 0.1
-SLEEP_LONG = 0.3
-
-def delivery_sleep() sleep(SLEEP_SHORT); end
-def connect_sleep() sleep(SLEEP_SHORT); end
-def bind_sleep() sleep(SLEEP_LONG); end
-def thread_startup_sleep() sleep(1.0); end
-
 def connect_to_inproc(socket, endpoint)
   begin
     rc = socket.connect(endpoint)

metadata

@@ -1,64 +1,64 @@
 --- !ruby/object:Gem::Specification
 name: ffi-rzmq
 version: !ruby/object:Gem::Version
+  version: 1.0.1
   prerelease: 
-  version: 1.0.0
 platform: ruby
 authors:
 - Chuck Remes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-24 00:00:00.000000000 Z
+date: 2013-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: ffi
+  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
     none: false
-  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  name: ffi
-  type: :runtime
 - !ruby/object:Gem::Dependency
-  prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.6'
+  name: rspec
+  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
     none: false
-  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.6'
-    none: false
-  name: rspec
-  type: :development
 - !ruby/object:Gem::Dependency
-  prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: rake
+  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
     none: false
-  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  name: rake
-  type: :development
 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
@@ -207,20 +207,20 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 requirements: []
 rubyforge_project: ffi-rzmq
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: This gem wraps the ZeroMQ (0mq) networking library using Ruby FFI (foreign