em-zeromq 0.4.0 → 0.4.1

data/README.md

@@ -66,6 +66,7 @@ EM.run {
 
   pull.on(:message) { |part|
     puts part.copy_out_string
+    part.close
   }
 
   EM.add_periodic_timer(1) {
@@ -73,6 +74,7 @@ EM.run {
   }
 }
 ```
+Note that it's important to close message parts to avoid memory leaks.
 
 ## License: ##
 

data/Rakefile

@@ -4,5 +4,6 @@ Bundler::GemHelper.install_tasks
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec) do |t|
   ENV['COVERAGE'] = "1"
+  t.rspec_opts = ['--color']
 end
 task :default => :spec

data/em-zeromq.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'eventmachine', '>= 1.0.0'
   s.add_dependency 'ffi', '>= 1.0.0'
-  s.add_dependency 'ffi-rzmq', '0.9.3'
+  s.add_dependency 'ffi-rzmq', '= 0.9.7'
 
   s.add_development_dependency 'rspec', '>= 2.5.0'
   s.add_development_dependency 'simplecov'

data/example/multi-part.rb

@@ -13,10 +13,13 @@ EM.run {
 
   pull.on(:message) { |part1, part2|
     p [:part1, part1.copy_out_string, :part2, part2.copy_out_string]
+    part1.close
+    part2.close
   }
 
   pull.on(:message) { |*parts|
     p [:parts, parts.map(&:copy_out_string)]
+    parts.each(&:close)
   }
 
   push = zmq.socket(ZMQ::PUSH)

data/example/simple.rb

@@ -36,6 +36,7 @@ EM.run do
   pull_socket.on(:message) { |*parts|
     parts.each do |m|
       puts m.copy_out_string
+      m.close
     end
   }
 

data/example/simpler.rb

@@ -15,6 +15,7 @@ EM.run {
 
   pull.on(:message) { |part|
     puts part.copy_out_string
+    part.close
   }
 
   EM.add_periodic_timer(1) {

data/lib/em-zeromq.rb

@@ -1,6 +1,13 @@
 require 'eventmachine'
 require 'ffi-rzmq'
 
+# compatibilty hacks for zmq 2.x/3.x
+module ZMQ
+  if LibZMQ.version3?
+    NOBLOCK = DONTWAIT
+  end
+end
+
 module EmZeromq
 
 end

data/lib/em-zeromq/socket.rb

@@ -6,7 +6,7 @@ module EventMachine
 
       include EventEmitter
 
-      attr_reader   :socket, :socket_type      
+      attr_reader   :socket, :socket_type
 
       def initialize(socket, socket_type)
         @socket      = socket
@@ -15,43 +15,53 @@ module EventMachine
         self.notify_readable = true if READABLES.include?(socket_type)
         self.notify_writable = true if WRITABLES.include?(socket_type)
       end
-      
+
       def self.map_sockopt(opt, name)
         define_method(name){ getsockopt(opt) }
-        define_method("#{name}="){|val| @socket.setsockopt(opt, val) }
+        define_method("#{name}="){|val| setsockopt(opt, val) }
+      end
+
+      if defined?(ZMQ::HWM)
+        map_sockopt(ZMQ::HWM, :hwm)
+      else
+        map_sockopt(ZMQ::SNDHWM, :sndhwm)
+        map_sockopt(ZMQ::RCVHWM, :rcvhwm)
+        def hwm=(val)
+          self.sndhwm = val
+          self.rcvhwm = val
+        end
       end
-      
-      map_sockopt(ZMQ::HWM, :hwm)
-      map_sockopt(ZMQ::SWAP, :swap)
+
+      map_sockopt(ZMQ::SWAP, :swap) if defined?(ZMQ::SWAP)
       map_sockopt(ZMQ::IDENTITY, :identity)
       map_sockopt(ZMQ::AFFINITY, :affinity)
       map_sockopt(ZMQ::SNDBUF, :sndbuf)
       map_sockopt(ZMQ::RCVBUF, :rcvbuf)
-      
+
       # pgm
       map_sockopt(ZMQ::RATE, :rate)
       map_sockopt(ZMQ::RECOVERY_IVL, :recovery_ivl)
-      map_sockopt(ZMQ::MCAST_LOOP, :mcast_loop)
-      
+      map_sockopt(ZMQ::MCAST_LOOP, :mcast_loop) if defined?(ZMQ::MCAST_LOOP)
+
       # User method
       def bind(address)
         @socket.bind(address)
       end
-      
+
       def connect(address)
         @socket.connect(address)
       end
-      
+
       def subscribe(what = '')
         raise "only valid on sub socket type (was #{@socket.name})" unless @socket.name == 'SUB'
         @socket.setsockopt(ZMQ::SUBSCRIBE, what)
       end
-      
+
       def unsubscribe(what)
         raise "only valid on sub socket type (was #{@socket.name})" unless @socket.name == 'SUB'
         @socket.setsockopt(ZMQ::UNSUBSCRIBE, what)
       end
-      
+
       # send a non blocking message
       # parts:  if only one argument is given a signle part message is sent
       #         if more than one arguments is given a multipart message is sent
@@ -61,34 +71,34 @@ module EventMachine
       def send_msg(*parts)
         parts = Array(parts[0]) if parts.size == 0
         sent = true
-        
+
         # multipart
         parts[0...-1].each do |msg|
-          sent = @socket.send_string(msg, ZMQ::NOBLOCK | ZMQ::SNDMORE)
-          if sent == false
+          ret = @socket.send_string(msg, ZMQ::NOBLOCK | ZMQ::SNDMORE)
+          if ret < 0
+            sent = false
             break
           end
         end
-        
+
         if sent
           # all the previous parts were queued, send
           # the last one
           ret = @socket.send_string(parts[-1], ZMQ::NOBLOCK)
           if ret < 0
-            raise "Unable to send message: #{ZMQ::Util.error_string}"
+            sent = false
           end
         else
           # error while sending the previous parts
           # register the socket for writability
           self.notify_writable = true
-          sent = false
         end
-        
+
         EM::next_tick{ notify_readable() }
-        
+
         sent
       end
-      
+
       def getsockopt(opt)
         ret = []
         rc = @socket.getsockopt(opt, ret)
@@ -96,9 +106,9 @@ module EventMachine
           raise ZMQOperationFailed, "getsockopt: #{ZMQ::Util.error_string}"
         end
 
-        (ret.size == 1) ? ret[0] : ret    
+        (ret.size == 1) ? ret[0] : ret
       end
-      
+
       def setsockopt(opt, value)
         @socket.setsockopt(opt, value)
       end
@@ -119,15 +129,15 @@ module EventMachine
           emit(:message, *message)
         end
       end
-      
+
       def notify_writable
         return unless writable?
-        
+
         # one a writable event is successfully received the socket
         # should be accepting messages again so stop triggering
         # write events
         self.notify_writable = false
-        
+
         emit(:writable)
       end
       def readable?
@@ -139,7 +149,7 @@ module EventMachine
         # ZMQ::EVENTS has issues in ZMQ HEAD, we'll ignore this till they're fixed
         # (getsockopt(ZMQ::EVENTS) & ZMQ::POLLOUT) == ZMQ::POLLOUT
       end
-     
+
     private
 
       def get_message

data/lib/em-zeromq/version.rb

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

data/spec/context_spec.rb

@@ -4,19 +4,10 @@ describe 'Context' do
   before do
     @ctx = EM::ZeroMQ::Context.new(1)
   end
-  
+
   it 'can be created with a context' do
     zmq_ctx = ZMQ::Context.new(1)
     ctx = EM::ZeroMQ::Context.new( zmq_ctx )
     ctx.instance_variable_get('@context').should == zmq_ctx
   end
-  
-  it 'can create socket' do
-    EM::run do
-      s = @ctx.socket(ZMQ::ROUTER)
-      s.instance_variable_get('@socket').name.should == 'ROUTER'
-      EM::stop_event_loop
-    end
-  end
 end
-

data/spec/pub_sub_spec.rb

@@ -18,7 +18,7 @@ describe EventMachine::ZeroMQ do
       @received = []
       @test_message = test_message = "TMsg#{rand(999)}"
       
-      run_reactor do
+      run_reactor(0.2) do
         address = rand_addr
         
         sub_conn  = SPEC_CTX.socket(ZMQ::SUB)
@@ -31,9 +31,9 @@ describe EventMachine::ZeroMQ do
         pub_conn  = SPEC_CTX.socket(ZMQ::PUB)
         pub_conn.connect(address)
         
-        pub_conn.socket.send_string test_message, ZMQ::NOBLOCK
-        
-        EM::Timer.new(0.1) { @results[:specs_ran] = true }
+        EM::Timer.new(0.1) do
+          pub_conn.socket.send_string test_message, ZMQ::NOBLOCK
+        end
       end
     end
   

data/spec/socket_spec.rb

@@ -0,0 +1,29 @@
+require File.join(File.dirname(__FILE__), %w[spec_helper])
+
+describe 'Socket' do
+  before do
+    @ctx = EM::ZeroMQ::Context.new(1)
+  end
+
+  it 'can create a socket' do
+    EM.run do
+      s = @ctx.socket(ZMQ::ROUTER)
+      s.instance_variable_get('@socket').name.should == 'ROUTER'
+      EM.stop
+    end
+  end
+
+  it 'can set hwm' do
+    EM.run do
+      s = @ctx.socket(ZMQ::PUSH)
+      s.hwm = 100
+      if defined?(ZMQ::HWM)
+        s.hwm.should == 100
+      else
+        s.rcvhwm.should == 100
+        s.sndhwm.should == 100
+      end
+      EM.stop
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -11,14 +11,10 @@ require File.expand_path(
     File.join(File.dirname(__FILE__), %w[.. lib em-zeromq]))
 
 def run_reactor(time=0.1,&block)
-  Thread.new do
-    EM.run do
-      yield
-    end
+  EM.run do
+    yield
+    EM.add_timer(time){EM.stop}
   end
-  sleep time
-  EM.stop rescue nil
-  sleep 0.1
 end
 
 USED_RAND_ADDRS = Set.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: em-zeromq
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-15 00:00:00.000000000 Z
+date: 2013-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -51,7 +51,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.9.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -59,7 +59,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.9.7
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -135,6 +135,7 @@ files:
 - spec/pub_sub_spec.rb
 - spec/push_pull_spec.rb
 - spec/router_dealer_spec.rb
+- spec/socket_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/andrewvc/em-zeromq
 licenses: []
@@ -152,7 +153,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4479496977537005722
+      hash: -528291771408101050
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -161,7 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4479496977537005722
+      hash: -528291771408101050
 requirements: []
 rubyforge_project: em-zeromq
 rubygems_version: 1.8.24
@@ -173,4 +174,5 @@ test_files:
 - spec/pub_sub_spec.rb
 - spec/push_pull_spec.rb
 - spec/router_dealer_spec.rb
+- spec/socket_spec.rb
 - spec/spec_helper.rb