zmqmachine 0.6.0 → 0.7.1

data/lib/zm/sockets/req.rb

@@ -42,7 +42,7 @@ module ZMQMachine
       include ZMQMachine::Socket::Base
 
       def initialize context, handler
-        @poll_options = 0
+        @poll_options = ZMQ::POLLIN
         @kind = :request
 
         super
@@ -74,6 +74,51 @@ module ZMQMachine
       end
     end # class Req
 
+    class XReq
+      include ZMQMachine::Socket::Base
+      include ZMQMachine::Socket::EnvelopeHelp
+
+      def initialize context, handler
+        @poll_options = ZMQ::POLLIN
+        @kind = :xrequest
+
+        super
+      end
+
+      # Attach a handler to the XREQ socket.
+      #
+      # A XREQ socket has no restrictions on the number of sends and
+      # recieves. Each send will silently prepend a message part to
+      # your outgoing data which the REP/XREP socket on the other end
+      # will use for matching up the transaction.
+      #
+      # This socket expects its +handler+ to
+      # implement at least the #on_readable method. This method
+      # will be called whenever a reply arrives. The #on_writable method
+      # will be called continually until the socket HWM is breached.
+      #
+      # For error handling purposes, the handler must also
+      # implement #on_readable_error.
+      #
+      def on_attach handler
+        raise ArgumentError, "Handler must implement an #on_readable method" unless handler.respond_to? :on_readable
+        raise ArgumentError, "Handler must implement an #on_readable_error method" unless handler.respond_to? :on_readable_error
+        raise ArgumentError, "Handler must implement an #on_writable method" unless handler.respond_to? :on_writable
+        raise ArgumentError, "Handler must implement an #on_writable_error method" unless handler.respond_to? :on_writable_error
+        super
+      end
+
+
+      private
+
+      def allocate_socket context
+        sock = ZMQ::Socket.new context.pointer, ZMQ::XREQ
+        sock
+      end
+    end # class XReq
+    
+    Dealer = XReq
+
   end # module Socket
 
 end # module ZMQMachine

data/lib/zm/sockets/sub.rb

@@ -46,7 +46,6 @@ module ZMQMachine
         @kind = :sub
 
         super
-        @state = :ready
       end
 
       # Attach a handler to the SUB socket.

data/lib/zm/timers.rb

@@ -47,7 +47,8 @@ module ZMQMachine
   # new timers are installed in the correct #Reactor.
   #
   class Timers
-    def initialize
+    def initialize(exception_handler)
+      @exception_handler = exception_handler
       @timers = []
     end
 
@@ -70,14 +71,14 @@ module ZMQMachine
       add timer
       timer
     end
-    
+
     # Adds a non-periodical, one-shot timer to be fired at
     # the specified time.
     #
     def add_oneshot_at exact_time, timer_proc = nil, &blk
       blk ||= timer_proc
       return nil unless blk
-      
+
       timer = Timer.new :timers => self, :exact_time => exact_time, :periodical => false, :timer_proc => blk
       add timer
       timer
@@ -113,7 +114,7 @@ module ZMQMachine
       if i < @timers.size && timer == @timers.at(i)
         @timers.delete_at(i) ? true : false
       else
-        # slow branch; necessary since the #index operation works 
+        # slow branch; necessary since the #index operation works
         # solely from the timer.fire_time attribute. There
         # could be multiple timers scheduled to fire at the
         # same time so the equivalence test above could fail
@@ -121,7 +122,7 @@ module ZMQMachine
         # slower method
         size = @timers.size
         @timers.delete_if { |t| t == timer }
-        
+
         # true when the array has shrunk, false otherwise
         @timers.size != size
       end
@@ -163,7 +164,20 @@ module ZMQMachine
       end
 
       remove expired_count
-      runnables.each { |timer| timer.fire }
+
+      while timer = runnables.shift
+        begin
+          timer.fire
+        rescue => e
+          if @exception_handler
+            @exception_handler.call(e)
+          else
+            renew(periodicals)
+            raise
+          end
+        end
+      end
+
       renew periodicals
     end
 
@@ -202,7 +216,7 @@ module ZMQMachine
 
     private
 
-    # inserts in order using a binary search (O(nlog n)) to find the 
+    # inserts in order using a binary search (O(nlog n)) to find the
     # index to insert; this scales nicely for situations where there
     # are many thousands thousands of timers
     def add timer
@@ -277,9 +291,8 @@ module ZMQMachine
     # itself.
     #
     def fire
-      @timer_proc.call
-
       schedule_firing_time if @periodical
+      @timer_proc.call
     end
 
     # Cancels this timer from firing.
@@ -291,7 +304,7 @@ module ZMQMachine
     def <=>(other)
       @fire_time <=> other.fire_time
     end
-    
+
     def ==(other)
       # need a more specific equivalence test since multiple timers could be
       # scheduled to go off at exactly the same time
@@ -316,15 +329,15 @@ module ZMQMachine
     def reschedule
       schedule_firing_time
     end
-    
+
     def to_s
       ftime = Time.at(@fire_time / 1000)
       fdelay = @fire_time - Timers.now
       name = @timer_proc.respond_to?(:name) ? @timer_proc.name : @timer_proc.to_s
-      
+
       "[delay [#{@delay}], periodical? [#{@periodical}], fire_time [#{ftime}] fire_delay_ms [#{fdelay}]] proc [#{name}]"
     end
-    
+
     def inspect; to_s; end
 
 

data/lib/zmqmachine.rb

@@ -65,7 +65,7 @@ require 'singleton'
 require 'ffi-rzmq'
 
 # the order of files is important
-%w(address exceptions timers deferrable log_client reactor message sockets devices).each do |file|
+%w(address exceptions timers deferrable configuration server log_client log_server reactor message sockets device).each do |file|
   require ZMQMachine.libpath(['zm', file])
 end
 

data/version.txt

@@ -1 +1 @@
-0.6.0
+0.7.1

data/zmqmachine.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{zmqmachine}
-  s.version = "0.6.0"
+  s.version = "0.7.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chuck Remes"]
-  s.date = %q{2011-07-21}
+  s.date = %q{2011-11-30}
   s.description = %q{ZMQMachine is another Ruby implementation of the reactor pattern but this
 time using 0mq sockets rather than POSIX sockets.
 
@@ -22,7 +22,7 @@ It is possible to extend the 0mq library to "poll" normal file
 descriptors. This isn't on my roadmap but patches are accepted.}
   s.email = %q{cremes@mac.com}
   s.extra_rdoc_files = ["History.txt", "README.rdoc", "version.txt"]
-  s.files = [".bnsignore", "History.txt", "README.rdoc", "Rakefile", "examples/fake_ftp.rb", "examples/one_handed_ping_pong.rb", "examples/ping_pong.rb", "examples/pub_sub.rb", "examples/pubsub_forwarder.rb", "examples/throttled_ping_pong.rb", "lib/zm/address.rb", "lib/zm/deferrable.rb", "lib/zm/devices.rb", "lib/zm/devices/forwarder.rb", "lib/zm/devices/queue.rb", "lib/zm/exceptions.rb", "lib/zm/log_client.rb", "lib/zm/message.rb", "lib/zm/reactor.rb", "lib/zm/sockets.rb", "lib/zm/sockets/base.rb", "lib/zm/sockets/pair.rb", "lib/zm/sockets/pub.rb", "lib/zm/sockets/rep.rb", "lib/zm/sockets/req.rb", "lib/zm/sockets/sub.rb", "lib/zm/sockets/xrep.rb", "lib/zm/sockets/xreq.rb", "lib/zm/sockets/push.rb", "lib/zm/sockets/pull.rb", "lib/zm/timers.rb", "lib/zmqmachine.rb", "spec/spec_helper.rb", "spec/reactor_spec.rb", "version.txt", "zmqmachine.gemspec"]
+  s.files = `git ls-files`.split("\n")
   s.homepage = %q{http://github.com/chuckremes/zmqmachine}
   s.rdoc_options = ["--main", "README.rdoc"]
   s.require_paths = ["lib"]
@@ -35,14 +35,14 @@ descriptors. This isn't on my roadmap but patches are accepted.}
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<ffi-rzmq>, [">= 0.7.0"])
+      s.add_runtime_dependency(%q<ffi-rzmq>, [">= 0.9.2"])
       s.add_development_dependency(%q<bones>, [">= 3.5.4"])
     else
-      s.add_dependency(%q<ffi-rzmq>, [">= 0.7.0"])
+      s.add_dependency(%q<ffi-rzmq>, [">= 0.9.0"])
       s.add_dependency(%q<bones>, [">= 3.5.4"])
     end
   else
-    s.add_dependency(%q<ffi-rzmq>, [">= 0.7.0"])
+    s.add_dependency(%q<ffi-rzmq>, [">= 0.9.0"])
     s.add_dependency(%q<bones>, [">= 3.5.4"])
   end
 end

metadata

@@ -1,52 +1,40 @@
 --- !ruby/object:Gem::Specification 
 name: zmqmachine
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 6
-  - 0
-  version: 0.6.0
+  prerelease: 
+  version: 0.7.1
 platform: ruby
 authors: 
-- Chuck Remes
+  - Chuck Remes
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-07-21 00:00:00 -05:00
+date: 2011-11-30 00:00:00 -06:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: ffi-rzmq
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 7
-        - 0
-        version: 0.7.0
-  type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: bones
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 5
-        - 4
-        version: 3.5.4
-  type: :development
-  version_requirements: *id002
+  - !ruby/object:Gem::Dependency 
+    name: ffi-rzmq
+    prerelease: false
+    requirement: &id001 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: 0.9.2
+    type: :runtime
+    version_requirements: *id001
+  - !ruby/object:Gem::Dependency 
+    name: bones
+    prerelease: false
+    requirement: &id002 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: 3.5.4
+    type: :development
+    version_requirements: *id002
 description: |-
   ZMQMachine is another Ruby implementation of the reactor pattern but this
   time using 0mq sockets rather than POSIX sockets.
@@ -67,76 +55,87 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- History.txt
-- README.rdoc
-- version.txt
+  - History.txt
+  - README.rdoc
+  - version.txt
 files: 
-- .bnsignore
-- History.txt
-- README.rdoc
-- Rakefile
-- examples/fake_ftp.rb
-- examples/one_handed_ping_pong.rb
-- examples/ping_pong.rb
-- examples/pub_sub.rb
-- examples/pubsub_forwarder.rb
-- examples/throttled_ping_pong.rb
-- lib/zm/address.rb
-- lib/zm/deferrable.rb
-- lib/zm/devices.rb
-- lib/zm/devices/forwarder.rb
-- lib/zm/devices/queue.rb
-- lib/zm/exceptions.rb
-- lib/zm/log_client.rb
-- lib/zm/message.rb
-- lib/zm/reactor.rb
-- lib/zm/sockets.rb
-- lib/zm/sockets/base.rb
-- lib/zm/sockets/pair.rb
-- lib/zm/sockets/pub.rb
-- lib/zm/sockets/rep.rb
-- lib/zm/sockets/req.rb
-- lib/zm/sockets/sub.rb
-- lib/zm/sockets/xrep.rb
-- lib/zm/sockets/xreq.rb
-- lib/zm/sockets/push.rb
-- lib/zm/sockets/pull.rb
-- lib/zm/timers.rb
-- lib/zmqmachine.rb
-- spec/spec_helper.rb
-- spec/reactor_spec.rb
-- version.txt
-- zmqmachine.gemspec
+  - .bnsignore
+  - .gitignore
+  - AUTHORS.txt
+  - History.txt
+  - README.rdoc
+  - Rakefile
+  - examples/fake_ftp.rb
+  - examples/one_handed_ping_pong.rb
+  - examples/ping_pong.rb
+  - examples/pub_sub.rb
+  - examples/pubsub_forwarder.rb
+  - examples/throttled_ping_pong.rb
+  - lib/zm/address.rb
+  - lib/zm/configuration.rb
+  - lib/zm/deferrable.rb
+  - lib/zm/device.rb
+  - lib/zm/device/configuration.rb
+  - lib/zm/device/forwarder.rb
+  - lib/zm/device/queue.rb
+  - lib/zm/exceptions.rb
+  - lib/zm/log_client.rb
+  - lib/zm/log_server.rb
+  - lib/zm/message.rb
+  - lib/zm/reactor.rb
+  - lib/zm/server.rb
+  - lib/zm/server/base.rb
+  - lib/zm/server/configuration.rb
+  - lib/zm/server/pair.rb
+  - lib/zm/server/pub.rb
+  - lib/zm/server/pull.rb
+  - lib/zm/server/push.rb
+  - lib/zm/server/rep.rb
+  - lib/zm/server/req.rb
+  - lib/zm/server/routing_envelope.rb
+  - lib/zm/server/sub.rb
+  - lib/zm/sockets.rb
+  - lib/zm/sockets/base.rb
+  - lib/zm/sockets/envelope_help.rb
+  - lib/zm/sockets/pair.rb
+  - lib/zm/sockets/pub.rb
+  - lib/zm/sockets/pull.rb
+  - lib/zm/sockets/push.rb
+  - lib/zm/sockets/rep.rb
+  - lib/zm/sockets/req.rb
+  - lib/zm/sockets/sub.rb
+  - lib/zm/timers.rb
+  - lib/zmqmachine.rb
+  - spec/reactor_spec.rb
+  - spec/spec_helper.rb
+  - version.txt
+  - zmqmachine.gemspec
 has_rdoc: true
 homepage: http://github.com/chuckremes/zmqmachine
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --main
-- README.rdoc
+  - --main
+  - README.rdoc
 require_paths: 
-- lib
+  - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
 requirements: []
 
 rubyforge_project: zmqmachine
-rubygems_version: 1.3.7
+rubygems_version: 1.5.1
 signing_key: 
 specification_version: 3
 summary: ZMQMachine is another Ruby implementation of the reactor pattern but this time using 0mq sockets rather than POSIX sockets.