bundesstrasse 0.0.2-java → 0.0.3-java

data/lib/bundesstrasse/context.rb

@@ -1,12 +1,33 @@
 
 module Bundesstrasse
-  ContextError = Class.new(StandardError)
-
   class Context
-    def self.context(io_threads=1)
-      @io_threads = io_threads unless @context
-      raise ContextError unless @io_threads == io_threads
-      @context ||= ZMQ::Context.create io_threads
+    include Errors
+
+    def initialize(zmq_context)
+      @zmq_context = zmq_context
+    end
+
+    def socket(socket_class, options={})
+      raise ContextError.new("Context terminated") if terminated?
+      zmq_socket = error_check { @zmq_context.socket(socket_class.type) }
+      socket = socket_class.new(zmq_socket, options)
+    rescue ZMQError => e
+      ContextError.raise_error(e)
+    end
+
+    def terminate!
+      @zmq_context.terminate
+      true
+    end
+
+    def terminated?
+      @zmq_context.context.nil?
+    end
+
+    def self.create(options={})
+      new ZMQ::Context.create(options[:io_threads] || 1)
     end
   end
+
+  ContextError = Class.new(ZMQError)
 end

data/lib/bundesstrasse/errors.rb

@@ -0,0 +1,31 @@
+module Bundesstrasse
+  class ZMQError < StandardError
+    attr_reader :error_code
+    def initialize(message, error_code=-1)
+      @error_code = error_code
+      super(message)
+    end
+
+    def self.raise_error(e)
+      raise new(e.message, e.error_code)
+    end
+  end
+
+  module Errors
+    def errno
+      ZMQ::Util.errno
+    end
+
+    def error_string
+      ZMQ::Util.error_string
+    end
+
+    def error_check(errors={}, &block)
+      if (res = block.call).is_a? Fixnum
+        res = res >= 0
+      end
+      raise ZMQError.new(error_string, errno) unless res
+      res
+    end
+  end
+end

data/lib/bundesstrasse/socket.rb

@@ -1,18 +1,11 @@
 
 module Bundesstrasse
   class Socket
-    def initialize(type, options={})
-      options = options.dup
-      context = Context.context(options.delete(:io_threads) || 1)
-      @socket = context.socket(type)
-      raise SocketError unless @socket
-      DEFAULT_OPTIONS.merge(options).each do |option, value|
-        begin
-          error_check { @socket.setsockopt ZMQ.const_get(option.upcase), value }
-        rescue NameError => e
-          raise ArgumentError, "Unknown socket option '#{option}'", e.backtrace
-        end
-      end
+    include Errors
+
+    def initialize(socket, options={})
+      @socket = socket
+      setup!(options)
     end
 
     def bind(address)
@@ -36,6 +29,10 @@ module Bundesstrasse
       connected_error_check { @socket.send_string message }
     end
 
+    def self.type
+      raise NotImplementedError, 'Subclasses define constant TYPE'
+    end
+
     private
 
     def connected_error_check(&block)
@@ -44,25 +41,27 @@ module Bundesstrasse
     end
 
     def error_check(&block)
-      unless ZMQ::Util.resultcode_ok? block.call
-        raise SocketError.new(ZMQ::Util.error_string, ZMQ::Util.errno)
+      super
+    rescue ZMQError => e
+      case e.error_code
+      when ZMQ::ETERM then close && TermError.raise_error(e)
+      when ZMQ::EAGAIN then AgainError.raise_error(e)
+      else SocketError.raise_error(e)
       end
-      true
     end
 
-    DEFAULT_OPTIONS = {
-      linger: 0,
-      rcvtimeo: -1,
-      sndtimeo: -1,
-    }
-
-  end
-
-  class SocketError < StandardError
-    attr_reader :error_code
-    def initialize(message, error_code=-1)
-      @error_code = error_code
-      super(message)
+    def setup!(options)
+      options.each do |option, value|
+        begin
+          error_check { @socket.setsockopt ZMQ.const_get(option.upcase), value }
+        rescue NameError => e
+          raise ArgumentError, "Unknown socket option '#{option}'", e.backtrace
+        end
+      end
     end
   end
+
+  SocketError = Class.new(ZMQError)
+  TermError = Class.new(ZMQError)
+  AgainError = Class.new(ZMQError)
 end

data/lib/bundesstrasse/sockets.rb

@@ -1,58 +1,58 @@
 
 module Bundesstrasse
   class ReqSocket < Socket
-    def initialize(options={})
-      super(ZMQ::REQ, options)
+    def self.type
+      ZMQ::REQ
     end
   end
 
   class RepSocket < Socket
-    def initialize(options={})
-      super(ZMQ::REP, options)
+    def self.type
+      ZMQ::REP
     end
   end
 
   class DealerSocket < Socket
-    def initialize(options={})
-      super(ZMQ::DEALER, options)
+    def self.type
+      ZMQ::DEALER
     end
   end
 
   class RouterSocket < Socket
-    def initialize(options={})
-      super(ZMQ::ROUTER, options)
+    def self.type
+      ZMQ::ROUTER
     end
   end
 
   class PushSocket < Socket    
-    def initialize(options={})
-      super(ZMQ::PUSH, options)
+    def self.type
+      ZMQ::PUSH
     end
   end
 
   class PullSocket < Socket
-    def initialize(options={})
-      super(ZMQ::PULL, options)
+    def self.type
+      ZMQ::PULL
     end
   end
 
   class PubSocket < Socket
-    def initialize(options={})
-      super(ZMQ::PUB, options)
+    def self.type
+      ZMQ::PUB
     end
   end
 
   class SubSocket < Socket
-    def initialize(options={})
-      super(ZMQ::SUB, options)
+    def self.type
+      ZMQ::SUB
     end
     
     def subscribe(topic)
-      error_check { @socket.setsockopt(::ZMQ::SUBSCRIBE, topic) }
+      error_check { @socket.setsockopt(ZMQ::SUBSCRIBE, topic) }
     end
     
     def unsubscribe(topic)
-      error_check { @socket.setsockopt(::ZMQ::UNSUBSCRIBE, topic) }
+      error_check { @socket.setsockopt(ZMQ::UNSUBSCRIBE, topic) }
     end
   end
 end

data/lib/bundesstrasse/version.rb

@@ -0,0 +1,3 @@
+module Bundesstrasse
+  VERSION = '0.0.3'.freeze
+end

data/lib/bundesstrasse.rb

@@ -1,6 +1,7 @@
 
 require 'ffi-rzmq'
 
+require 'bundesstrasse/errors'
 require 'bundesstrasse/context'
 require 'bundesstrasse/socket'
 require 'bundesstrasse/sockets'

metadata

@@ -2,14 +2,14 @@
 name: bundesstrasse
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.0.2
+  version: 0.0.3
 platform: java
 authors:
 - Joel Segerlind
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-02-05 00:00:00.000000000 Z
+date: 2013-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi-rzmq
@@ -74,8 +74,10 @@ extra_rdoc_files: []
 files:
 - lib/bundesstrasse.rb
 - lib/bundesstrasse/context.rb
+- lib/bundesstrasse/errors.rb
 - lib/bundesstrasse/socket.rb
 - lib/bundesstrasse/sockets.rb
+- lib/bundesstrasse/version.rb
 homepage: https://github.com/jowl/bundesstrasse
 licenses: []
 post_install_message:
@@ -86,6 +88,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
+      segments:
+      - 0
+      hash: 2
       version: !binary |-
         MA==
   none: false