zack 0.3.0 → 0.3.1

data/History.txt

@@ -1,3 +1,7 @@
+= 0.3.1 / 31Aug2011
+
+  . small refactorings
+
 = 0.3.0 / 20Jul2011
 
   + Channel names are generated using UUIDs. No duplicate detection yet. 

data/lib/zack/client.rb

@@ -1,67 +1,42 @@
 
-require 'uuid'
 
-# Client part of Zack RPC
-#
-class Zack::Client
-  attr_reader :service
-  
-  def initialize(tube_name, opts={})
-    server = opts[:server] || 'beanstalk:11300'
-    # Only respond to these messages
-    @only        = opts[:only] || proc { true }
-    # These have answers (wait for the server to answer)
-    @with_answer = opts[:with_answer] || []
+module Zack
+  # Client for a simple client-server RPC connection. 
+  #
+  class Client
+    attr_reader :service
 
-    @outgoing = Cod.beanstalk(server, tube_name)
-    unless @with_answer.empty?
-      @incoming = Cod.beanstalk(server, 
-        unique_tube_name(tube_name))
-    end
+    # Constructs a client for the service given by tube_name. Optional
+    # arguments are: 
+    #
+    # :server :: beanstalkd server location url
+    # :only :: ignores all messages not in this hash
+    # :with_answer :: these messages wait for an answer from the service
+    #
+    def initialize(tube_name, opts={})
+      server = opts[:server] || 'beanstalk:11300'
+      # Only respond to these messages
+      @only        = opts[:only] || proc { true }
+      # These have answers (wait for the server to answer)
+      @with_answer = opts[:with_answer] || []
+
+      @outgoing = Cod.beanstalk(server, tube_name)
+      unless @with_answer.empty?
+        @incoming = Cod.beanstalk(server, 
+          UniqueName.new(tube_name))
+      end
     
-    @service = Cod::Client.new(@outgoing, @incoming, 1)
-  end
+      @service = Cod::Client.new(@outgoing, @incoming, 1)
+    end
   
-  def respond_to?(msg)
-    !! @only[msg]
-  end
-  def method_missing(sym, *args, &block)
-    super unless respond_to?(sym)
-    
-    raise ArgumentError, "Can't call methods remotely with a block" if block
+    def respond_to?(msg)
+      !! @only[msg]
+    end
 
-    if has_answer?(sym)
-      return service.call([sym, args])
-    else
-      service.notify [sym, args]
-      return nil
+    def has_answer?(sym)
+      @with_answer.include?(sym.to_sym)
     end
-  rescue Cod::Channel::TimeoutError
-    raise Zack::ServiceTimeout, "No response from server in the allowed time."
-  end
-  
-  def has_answer?(sym)
-    @with_answer.include?(sym.to_sym)
-  end
 
-private 
-  # Pretend that UUIDs don't collide for now.
-  #
-  def unique_tube_name(name)
-    "name.#{uuid}"
-  end
-  def uuid
-    uuid_generator.generate
-  end
-  def uuid_generator
-    generator=Thread.current[:zack_uuid_generator]
-    return generator if generator
-    
-    # assert: generator is nil
-    
-    # Pretend we've just forked, because that might be the case. 
-    UUID.generator.next_sequence
-    
-    Thread.current[:zack_uuid_generator]=generator=UUID.new
+    include TransparentProxy
   end
 end

data/lib/zack/server.rb

@@ -1,61 +1,23 @@
 
-# Server side for RPC calls. 
-#
-class Zack::Server
-  class SimpleFactory < Struct.new(:implementation_klass)
-    def produce; implementation_klass.new; end
-  end
-    
-  attr_reader :service
+module Zack
+  # Server side for RPC calls. 
+  #
+  class Server < Target
+    attr_reader :service
   
-  def initialize(tube_name, opts={})
-    server = opts[:server] || 'beanstalk:11300'
-    
-    if opts.has_key? :factory
-      @factory = opts[:factory]
-    elsif opts.has_key? :simple
-      @factory = SimpleFactory.new(opts[:simple])
-    else
-      raise ArgumentError, "Either :factory or :simple argument must be given." 
-    end
+    def initialize(tube_name, opts={})
+      super
         
-    channel = Cod.beanstalk(server, tube_name)
-    @service = Cod::Service.new(channel)
-  end
-  
-  # Handles exactly one request. 
-  #
-  def handle_request
-    service.one { |(sym, args)|  
-      instance = @factory.produce
-      
-      instance.send(sym, *args)
-    }
-  end
-
-  # Runs the server and keeps running until the world ends (or the process, 
-  # whichever comes first).
-  #
-  def run(&block)
-    loop do
-      exception_handling(block) do
-        handle_request
-      end
+      channel = Cod.beanstalk(server, tube_name)
+      @service = Cod::Service.new(channel)
     end
-  end
   
-private
-  # Defines how the server handles exception. 
-  #
-  def exception_handling(exception_handler)
-    if exception_handler
-      begin
-        yield
-      rescue => exception
-        exception_handler.call(exception)
-      end
-    else
-      yield
+    # Handles exactly one request. 
+    #
+    def handle_request
+      service.one { |(sym, args)|  
+        process_request(sym, args)
+      }
     end
   end
 end

data/lib/zack.rb

@@ -2,11 +2,16 @@
 require 'cod'
 
 module Zack
-  autoload :Server, 'zack/server'
-  autoload :Client, 'zack/client'
-  
   # Gets raised when the server doesn't answer within the currently configured
   # timeout for a message that waits for an answer. 
   #
   class ServiceTimeout < StandardError; end
 end
+
+require 'zack/transparent_proxy'
+require 'zack/unique_name'
+
+require 'zack/target'
+
+require 'zack/server'
+require 'zack/client'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zack
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,12 +10,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-20 00:00:00.000000000 +02:00
+date: 2011-08-31 00:00:00.000000000 +02:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cod
-  requirement: &2157732620 !ruby/object:Gem::Requirement
+  requirement: &2166707740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +23,10 @@ dependencies:
         version: '0.3'
   type: :runtime
   prerelease: false
-  version_requirements: *2157732620
+  version_requirements: *2166707740
 - !ruby/object:Gem::Dependency
   name: beanstalk-client
-  requirement: &2157731840 !ruby/object:Gem::Requirement
+  requirement: &2166707260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -34,7 +34,18 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157731840
+  version_requirements: *2166707260
+- !ruby/object:Gem::Dependency
+  name: uuid
+  requirement: &2166706800 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2166706800
 description: 
 email:
 - kaspar.schiess@absurd.li