Added ability for actors to receive the deliverable together with the…

… payload.

lib/nanite/dispatcher.rb

@@ -14,12 +14,15 @@ def initialize(amq, registry, serializer, identity, options)
 
     def dispatch(deliverable)
       prefix, meth = deliverable.type.split('/')[1..-1]
+      meth ||= :index
       actor = registry.actor_for(prefix)
 
       @evmclass.defer(lambda {
         begin
           intermediate_results_proc = lambda { |*args| self.handle_intermediate_results(actor, meth, deliverable, *args) }
-          actor.send((meth.nil? ? :index : meth), deliverable.payload, &intermediate_results_proc)
+          args = [ deliverable.payload ]
+          args.push(deliverable) if actor.method(meth).arity == 2
+          actor.send(meth, *args, &intermediate_results_proc)
         rescue Exception => e
           handle_exception(actor, meth, deliverable, e)
         end

spec/dispatcher_spec.rb

@@ -13,6 +13,10 @@ def index(payload)
   def bar(payload)
     ['hello', payload]
   end
+
+  def bar2(payload, deliverable)
+    deliverable
+  end
 
   def i_kill_you(payload)
     raise RuntimeError.new('I kill you!')
@@ -73,6 +77,14 @@ def self.defer(op = nil, callback = nil)
     res.results.should == ['hello', 'you']
   end
 
+  it "should dispatch the deliverable to actions that accept it" do
+    req = Nanite::Request.new('/foo/bar2', 'you')
+    res = @dispatcher.dispatch(req)
+    res.should(be_kind_of(Nanite::Result))
+    res.token.should == req.token
+    res.results.should == req
+  end
+
   it "should dispatch a request to the default action" do
     req = Nanite::Request.new('/foo', 'you')
     res = @dispatcher.dispatch(req)