bundesstrasse 0.0.9 → 0.1.0

data/lib/bundesstrasse.rb

@@ -1,8 +1,11 @@
 require 'ffi-rzmq'
 
+module Bundesstrasse
+  Poller = ZMQ::Poller
+end
+
 require 'bundesstrasse/errors'
 require 'bundesstrasse/context'
 require 'bundesstrasse/socket'
-require 'bundesstrasse/sockets'
 require 'bundesstrasse/device'
 require 'bundesstrasse/devices'

data/lib/bundesstrasse/context.rb

@@ -7,10 +7,16 @@ module Bundesstrasse
       @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)
+    def socket(socket_type, options={})
+      raise ContextError, 'Context terminated' if terminated?
+      socket_type = translate_socket_type(socket_type)
+      zmq_socket = error_check { @zmq_context.socket(socket_type) }
+      case socket_type
+      when ZMQ::SUB, ZMQ::XSUB
+        SubSocket.new(zmq_socket, options)
+      else
+        Socket.new(zmq_socket, options)
+      end
     rescue ZMQError => e
       ContextError.raise_error(e)
     end
@@ -27,6 +33,23 @@ module Bundesstrasse
     def self.create(options={})
       new ZMQ::Context.create(options[:io_threads] || 1)
     end
+
+    private
+
+    SYMBOLIC_TYPES  = [:pair, :pub, :sub, :req, :rep, :dealer, :router, :pull, :push, :xpub, :xsub].freeze
+
+    def translate_socket_type(type)
+      return type unless type.is_a?(Symbol)
+      SYMBOLIC_TYPES.index(type)
+    end
+
+    public
+
+    SYMBOLIC_TYPES.each do |type|
+      define_method("#{type}_socket") do |options={}|
+        socket(type, options)
+      end
+    end
   end
 
   ContextError = Class.new(ZMQError)

data/lib/bundesstrasse/devices.rb

@@ -7,12 +7,12 @@ module Bundesstrasse
     end
     
     def create_endpoint!(options={})
-      @context.socket(RepSocket, options)
+      @context.socket(ZMQ::REP, options)
     end
 
     def self.create(context)
-      frontend = context.socket(RouterSocket)
-      backend = context.socket(DealerSocket)
+      frontend = context.socket(ZMQ::ROUTER)
+      backend = context.socket(ZMQ::DEALER)
       new(context, frontend, backend)
     end
   end
@@ -23,8 +23,8 @@ module Bundesstrasse
     end
     
     def self.create(context)
-      frontend = context.socket(SubSocket)
-      backend = context.socket(PubSocket)
+      frontend = context.socket(ZMQ::SUB)
+      backend = context.socket(ZMQ::PUB)
       new(frontend, backend)
     end
   end
@@ -35,8 +35,8 @@ module Bundesstrasse
     end
     
     def self.create(context)
-      frontend = context.socket(PullSocket)
-      backend = context.socket(PushSocket)
+      frontend = context.socket(ZMQ::PULL)
+      backend = context.socket(ZMQ::PUSH)
       new(frontend, backend)
     end
   end

data/lib/bundesstrasse/socket.rb

@@ -60,10 +60,6 @@ module Bundesstrasse
       @connected
     end
 
-    def self.type
-      raise NotImplementedError, 'Subclasses must override Socket::type'
-    end
-
     private
 
     def connected_error_check(&block)
@@ -92,6 +88,16 @@ module Bundesstrasse
     end
   end
 
+  class SubSocket < Socket
+    def subscribe(topic)
+      error_check { @socket.setsockopt(ZMQ::SUBSCRIBE, topic) }
+    end
+
+    def unsubscribe(topic)
+      error_check { @socket.setsockopt(ZMQ::UNSUBSCRIBE, topic) }
+    end
+  end
+
   SocketError = Class.new(ZMQError)
   TermError = Class.new(ZMQError)
   AgainError = Class.new(ZMQError)

data/lib/bundesstrasse/version.rb

@@ -1,3 +1,3 @@
 module Bundesstrasse
-  VERSION = '0.0.9'.freeze
+  VERSION = '0.1.0'.freeze
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: bundesstrasse
 version: !ruby/object:Gem::Version
-  version: 0.0.9
   prerelease:
+  version: 0.1.0
 platform: ruby
 authors:
 - Joel Segerlind
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-03-27 00:00:00.000000000 Z
+date: 2013-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi-rzmq
@@ -78,7 +78,6 @@ files:
 - lib/bundesstrasse/devices.rb
 - lib/bundesstrasse/errors.rb
 - lib/bundesstrasse/socket.rb
-- lib/bundesstrasse/sockets.rb
 - lib/bundesstrasse/version.rb
 homepage: https://github.com/jowl/bundesstrasse
 licenses: []
@@ -92,9 +91,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       segments:
       - 0
+      hash: 2
       version: !binary |-
         MA==
-      hash: 2
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
@@ -102,9 +101,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       segments:
       - 0
+      hash: 2
       version: !binary |-
         MA==
-      hash: 2
   none: false
 requirements: []
 rubyforge_project:

data/lib/bundesstrasse/sockets.rb

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