em-zeromq 0.2.2 → 0.2.3

data/README.md

@@ -1,19 +1,48 @@
 # em-zeromq #
 
+## Current maintainer ##
+
+This gem is currently maintained by schmurfy, it will stay here for now
+but may be moved to my account later.
+
 ## Description: ##
 
 EventMachine support for ZeroMQ
 
 ## Usage: ##
 
-Tested and functional with Rubinius, jRuby, and 1.9.2.
+Supported on:
+- MRI 1.9+
+- Rubinius
+- JRuby
 
-If using 1.9.2 you must `gem install ffi` before using.
-
-MRI 1.8.7 does not work with libzmq.
+While the gem should work on Rubinius and JRuby I mainly use it with MRI 1.9+ so
+there may be some glitchs.
 
 Want to help out? Ask!
 
+## Usage Warning ##
+
+To ensure your zeromq context won't be reclaimed by the garbage collector you need
+to keep a reference to it in scope, this is what you don't want to do (that's how the example used to be written):
+
+```ruby
+EM.run do
+  context = EM::ZeroMQ::Context.new(1)
+  dealer_socket = context.connect(...)
+  dealer_socket.send_msg('', "ping")
+end
+```
+
+If you do this everything will appear to work fine at first but as soon as the garbage collector
+is triggered your context will get destroyed and your application will hang.
+
+The same may be true for references to socket but I have no evidence of that.  
+It should not be a major problem anyway since code like above is only written for examples/tests
+but I just pulled my hair trying to figure out why my test code was not working so now you
+have been warned !
+
+
 ## Example ##
 ```ruby
 require 'rubygems'
@@ -30,9 +59,9 @@ class EMTestPullHandler
   end
 end
 
+
+ctx = EM::ZeroMQ::Context.new(1)
 EM.run do
-  ctx = EM::ZeroMQ::Context.new(1)
-  
   # setup push sockets
   push_socket1 = ctx.bind( ZMQ::PUSH, 'tcp://127.0.0.1:2091')
   push_socket2 = ctx.bind( ZMQ::PUSH, 'ipc:///tmp/a')

data/em-zeromq.gemspec

@@ -6,8 +6,8 @@ Gem::Specification.new do |s|
   s.name        = "em-zeromq"
   s.version     = EmZeromq::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Andrew Cholakian"]
-  s.email       = ["andrew@andrewvc.com"]
+  s.authors     = ["Andrew Cholakian", "Julien Ammous"]
+  s.email       = ["schmurfy@gmail.com"]
   s.homepage    = "https://github.com/andrewvc/em-zeromq"
   s.summary     = %q{Low level event machine support for ZeroMQ}
   s.description = %q{Low level event machine support for ZeroMQ}
@@ -15,9 +15,9 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "em-zeromq"
 
-  s.add_dependency 'eventmachine', '>= 1.0.0.beta.4'
+  s.add_dependency 'eventmachine', '1.0.0.beta.4'
   s.add_dependency 'ffi', '>= 1.0.0'
-  s.add_dependency 'ffi-rzmq', '~> 0.9.0'
+  s.add_dependency 'ffi-rzmq', '0.9.3'
 
   s.add_development_dependency 'rspec', '>= 2.5.0'
   s.add_development_dependency 'rake'

data/example/simple.rb

@@ -19,9 +19,9 @@ end
 
 puts "Started (with zmq #{ZMQ::Util.version.join('.')})."
 
+
+ctx = EM::ZeroMQ::Context.new(1)
 EM.run do
-  ctx = EM::ZeroMQ::Context.new(1)
-  
   # setup push sockets
   push_socket1 = ctx.bind( ZMQ::PUSH, 'tcp://127.0.0.1:2091')
   push_socket2 = ctx.bind( ZMQ::PUSH, 'ipc:///tmp/a')

data/lib/em-zeromq/connection.rb

@@ -12,7 +12,7 @@ module EventMachine
       end
       
       def self.map_sockopt(opt, name)
-        define_method(name){ @socket.getsockopt(opt) }
+        define_method(name){ getsockopt(opt) }
         define_method("#{name}="){|val| @socket.setsockopt(opt, val) }
       end
       
@@ -68,13 +68,30 @@ module EventMachine
         if sent
           # all the previous parts were queued, send
           # the last one
-          @socket.send_string(parts[-1], ZMQ::NOBLOCK)
+          ret = @socket.send_string(parts[-1], ZMQ::NOBLOCK)
+          if ret < 0
+            raise "Unable to send message: #{ZMQ::Util.error_string}"
+          end
         else
           # error while sending the previous parts
           # register the socket for writability
           self.notify_writable = true
-          false
+          sent = false
         end
+        
+        notify_readable()
+        
+        sent
+      end
+      
+      def getsockopt(opt)
+        ret = []
+        rc = @socket.getsockopt(opt, ret)
+        unless ZMQ::Util.resultcode_ok?(rc)
+          raise ZMQOperationFailed, "getsockopt: #{ZMQ::Util.error_string}"
+        end
+
+        (ret.size == 1) ? ret[0] : ret    
       end
       
       def setsockopt(opt, value)
@@ -143,13 +160,13 @@ module EventMachine
         end
       end
       def readable?
-        (@socket.getsockopt(ZMQ::EVENTS) & ZMQ::POLLIN) == ZMQ::POLLIN
+        (getsockopt(ZMQ::EVENTS) & ZMQ::POLLIN) == ZMQ::POLLIN
       end
 
       def writable?
         return true
         # ZMQ::EVENTS has issues in ZMQ HEAD, we'll ignore this till they're fixed
-        # (@socket.getsockopt(ZMQ::EVENTS) & ZMQ::POLLOUT) == ZMQ::POLLOUT
+        # (getsockopt(ZMQ::EVENTS) & ZMQ::POLLOUT) == ZMQ::POLLOUT
       end
      
     private

data/lib/em-zeromq/context.rb

@@ -45,8 +45,12 @@ module EventMachine
           socket.connect(address)
         end
         
-        fd = socket.getsockopt(ZMQ::FD)
-        conn = EM.watch(fd, EventMachine::ZeroMQ::Connection, socket, socket_type, address, handler)
+        fd = []
+        if socket.getsockopt(ZMQ::FD, fd) < 0
+          raise "Unable to get socket FD: #{ZMQ::Util.error_string}"
+        end
+        
+        conn = EM.watch(fd[0], EventMachine::ZeroMQ::Connection, socket, socket_type, address, handler)
 
         if READABLES.include?(socket_type)
           conn.register_readable

data/lib/em-zeromq/rzmq_compat.rb

@@ -4,39 +4,13 @@ module RZMQCompat
   
   def self.included(klass)
     klass.instance_eval do
-      %w(getsockopt recv).each do |m|
+      %w(recv).each do |m|
         alias_method :"#{m}_without_raise", m.to_sym
         alias_method m.to_sym, :"#{m}_with_raise"
       end
     end
   end
   
-  def getsockopt_with_raise(opt, *args)
-    arity = method(:getsockopt_without_raise).arity
-    if args.empty?
-      case arity
-      when 1
-        getsockopt_without_raise(opt)
-        
-      when 2
-        ret = []
-        rc = getsockopt_without_raise(opt, ret)
-        unless ZMQ::Util.resultcode_ok?(rc)
-          raise ZMQOperationFailed, "getsockopt: #{ZMQ.errno}"
-        end
-    
-        (ret.size == 1) ? ret[0] : ret
-  
-      else
-        raise "Unsupported version of ffi-rzmq, getsockopt takes #{arity} arguments"
-      end
-    
-    else
-      # just pass the call to the original method  
-      getsockopt_without_raise(opt, *args)
-    end
-  end
-  
   def recv_with_raise(msg, flags = 0)
     ret = recv_without_raise(msg, flags)
     if (ret == true) || (ret == 0)

data/lib/em-zeromq/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module EmZeromq
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/spec/router_dealer_spec.rb

@@ -23,11 +23,10 @@ describe EventMachine::ZeroMQ do
       @on_writable_callback.call(socket) if @on_writable_callback
     end
     def on_readable(socket, messages)
-      ident, delim, message = messages.map(&:copy_out_string)
-      ident.should == "dealer1"
-      @received += [ident, delim, message].map {|s| ZMQ::Message.new(s)}
+      _, message = messages.map(&:copy_out_string)
+      @received += [message].map {|s| ZMQ::Message.new(s)}
       
-      socket.send_msg(ident, delim, "re:#{message}")
+      socket.send_msg('', "re:#{message}")
     end
   end
 
@@ -44,16 +43,19 @@ describe EventMachine::ZeroMQ do
       results = {}
       @test_message = test_message = "M#{rand(999)}"
       
-      run_reactor(0.5) do
+      run_reactor(2) do
         results[:dealer_hndlr] = dealer_hndlr = EMTestDealerHandler.new
         results[:router_hndlr] = router_hndlr = EMTestRouterHandler.new
 
         addr = rand_addr
         dealer_conn = SPEC_CTX.bind(ZMQ::DEALER, addr, dealer_hndlr, :identity => "dealer1")
         router_conn = SPEC_CTX.connect(ZMQ::ROUTER, addr, router_hndlr, :identity => "router1")
-        router_conn.send_msg('x', test_message)
+        
+        EM::add_timer(0.1) do
+          router_conn.send_msg('dealer1','', test_message)
+        end
          
-        EM::Timer.new(0.1) do
+        EM::Timer.new(0.2) do
           results[:specs_ran] = true
         end
       end

metadata

@@ -1,30 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: em-zeromq
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
 - Andrew Cholakian
+- Julien Ammous
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-27 00:00:00.000000000 Z
+date: 2012-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &7728660 !ruby/object:Gem::Requirement
+  requirement: &70154900691620 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - =
       - !ruby/object:Gem::Version
         version: 1.0.0.beta.4
   type: :runtime
   prerelease: false
-  version_requirements: *7728660
+  version_requirements: *70154900691620
 - !ruby/object:Gem::Dependency
   name: ffi
-  requirement: &7728080 !ruby/object:Gem::Requirement
+  requirement: &70154900707520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,21 +33,21 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *7728080
+  version_requirements: *70154900707520
 - !ruby/object:Gem::Dependency
   name: ffi-rzmq
-  requirement: &7727520 !ruby/object:Gem::Requirement
+  requirement: &70154900707060 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - =
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.9.3
   type: :runtime
   prerelease: false
-  version_requirements: *7727520
+  version_requirements: *70154900707060
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &7726580 !ruby/object:Gem::Requirement
+  requirement: &70154900706600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +55,10 @@ dependencies:
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *7726580
+  version_requirements: *70154900706600
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &7725760 !ruby/object:Gem::Requirement
+  requirement: &70154900706220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7725760
+  version_requirements: *70154900706220
 description: Low level event machine support for ZeroMQ
 email:
-- andrew@andrewvc.com
+- schmurfy@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -105,16 +106,27 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3798582032913593030
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3798582032913593030
 requirements: []
 rubyforge_project: em-zeromq
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Low level event machine support for ZeroMQ
-test_files: []
+test_files:
+- spec/context_spec.rb
+- spec/pub_sub_spec.rb
+- spec/push_pull_spec.rb
+- spec/router_dealer_spec.rb
+- spec/spec_helper.rb