zack 0.1.2 → 0.2.0

data/History.txt

@@ -1,3 +1,17 @@
+= 0.2.0 / ???
+
+  + Starting with this version, zack depends on Cod for all its inner workings
+    and just adds RPC. This makes it lean to the point of nonexistence. 
+
+= 0.1.3 / not released
+
+  + All calls now have a default timeout of 10 seconds. Timeouts reset the
+    queue in a good state. Look at the :timeout option on the client.
+    
+  * The big refactoring, introducing Answer and Message. 
+  
+  + Server exception handling: Just run with a block that acts on the exception. 
+
 = 0.1.2 / 09-11-2010
 
   * FIX: Don't read our own messages back (client)

data/Rakefile

@@ -2,10 +2,9 @@ require "rubygems"
 require "rake/gempackagetask"
 require "rake/rdoctask"
 
-require "spec"
-require "spec/rake/spectask"
-Spec::Rake::SpecTask.new
-
+require 'rspec'
+require 'rspec/core/rake_task'
+Rspec::Core::RakeTask.new
 task :default => :spec
 
 # This builds the actual gem. For details of what all these options
@@ -17,8 +16,8 @@ spec = Gem::Specification.new do |s|
 
   # Change these as appropriate
   s.name              = "zack"
-  s.version           = "0.1.2"
-  s.summary           = "Ruby RPC calls via beanstalkd"
+  s.version           = "0.2.0"
+  s.summary           = "Ruby RPC calls via Cod"
   s.authors           = ['Kaspar Schiess', 'Patrick Marchi']
   s.email             = ["kaspar.schiess@absurd.li", 'mail@patrickmarchi.ch']
   s.homepage          = "http://github.com/kschiess/zack"
@@ -31,9 +30,8 @@ spec = Gem::Specification.new do |s|
   s.files             = %w(History.txt LICENSE Rakefile README) + Dir.glob("{spec,lib/**/*}")
   s.require_paths     = ["lib"]
 
-  # If you want to depend on other gems, add them here, along with any
-  # relevant versions
-  s.add_dependency("beanstalk-client", "~> 1.0.2")
+  s.add_dependency("cod", "~> 0.2")
+  s.add_dependency("beanstalk-client", "~> 1.0")
 
   # If your tests use any gems, include them here
   s.add_development_dependency("rspec")

data/lib/zack/client.rb

@@ -1,46 +1,44 @@
 
-require 'digest/md5' # ruby 1.9
 
 # Client part of Zack RPC
 #
 class Zack::Client
+  attr_reader :service
+  
   def initialize(tube_name, opts={})
     server = opts[:server] || 'beanstalk:11300'
-    
-    @connection = Beanstalk::Connection.new(server, tube_name)
-
+    # Only respond to these messages
+    @only        = opts[:only] || proc { true }
+    # These have answers (wait for the server to answer)
     @with_answer = opts[:with_answer] || []
-    unless @with_answer.empty?
-      # Ain't it beautiful
-      digest = Digest::MD5.new
-      digest << @connection.instance_variable_get('@socket').addr.to_s
 
-      @answer_queue_name = "answer_"+digest.hexdigest
-      @answer_connection = Beanstalk::Connection.new(server, @answer_queue_name)
+    @outgoing = Cod.beanstalk(server, tube_name)
+    unless @with_answer.empty?
+      @incoming = Cod.beanstalk(server)
     end
+    
+    @service = Cod::Client.new(@outgoing, @incoming, 1)
   end
   
   def respond_to?(msg)
-    true
+    !! @only[msg]
   end
-  def method_missing(sym, *args, &result_callback)
-    message = [sym, args]
+  def method_missing(sym, *args, &block)
+    super unless respond_to?(sym)
     
-    if @with_answer.include? sym
-      message << @answer_queue_name
-    end
-    
-    @connection.put message.to_yaml
+    raise ArgumentError, "Can't call methods remotely with a block" if block
 
-    if @with_answer.include? sym
-      answer = @answer_connection.reserve
-      begin
-        return YAML.load(answer.body)
-      ensure
-        answer.delete
-      end
+    if has_answer?(sym)
+      return service.call([sym, args])
+    else
+      service.notify [sym, args]
+      return nil
     end
-    
-    return nil
+  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
 end

data/lib/zack/server.rb

@@ -5,8 +5,8 @@ class Zack::Server
   class SimpleFactory < Struct.new(:implementation_klass)
     def produce; implementation_klass.new; end
   end
-  
-  attr_reader :tube_name
+    
+  attr_reader :service
   
   def initialize(tube_name, opts={})
     server = opts[:server] || 'beanstalk:11300'
@@ -19,50 +19,43 @@ class Zack::Server
       raise ArgumentError, "Either :factory or :simple argument must be given." 
     end
         
-    @tube_name = tube_name
-    @connection = Beanstalk::Connection.new(server, tube_name)
+    channel = Cod.beanstalk(server, tube_name)
+    @service = Cod::Service.new(channel)
   end
   
   # Handles exactly one request. 
   #
   def handle_request
-    job = @connection.reserve
-    sym, args, answer_tube = nil, nil, nil
-    begin
-      sym, args, answer_tube = YAML.load(job.body)
-    ensure
-      # If yaml decoding crashes, the message is probably invalid. Delete it. 
-      # If an exception is raised later on, we treat the request as satisfied.
-      job.delete
-    end
-    
-    instance = @factory.produce
-    retval = instance.send(sym, *args)
-    
-    if answer_tube
-      on_tube(answer_tube) do
-        @connection.put retval.to_yaml
-      end
-    end
+    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
+  def run(&block)
     loop do
-      handle_request
+      exception_handling(block) do
+        handle_request
+      end
     end
   end
   
 private
-  def on_tube(temporary_tube_name)
-    begin
-      @connection.use temporary_tube_name
-      
+  # 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
-    ensure
-      @connection.use @tube_name
     end
   end
 end

data/lib/zack.rb

@@ -1,7 +1,12 @@
-require 'beanstalk-client'
-require 'yaml'
 
-module Zack; end
+require 'cod'
 
-require 'zack/server'
-require 'zack/client'
+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

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: zack
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 2
-  version: 0.1.2
+  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors: 
 - Kaspar Schiess
@@ -15,50 +11,53 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-09 00:00:00 +01:00
+date: 2011-04-27 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: beanstalk-client
+  name: cod
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 2
-        version: 1.0.2
+        version: "0.2"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: beanstalk-client
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "1.0"
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: flexmock
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
-  version_requirements: *id003
+  version_requirements: *id004
 description: 
 email: 
 - kaspar.schiess@absurd.li
@@ -92,23 +91,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
-summary: Ruby RPC calls via beanstalkd
+summary: Ruby RPC calls via Cod
 test_files: []