right_agent 0.9.6 → 0.9.7

data/lib/right_agent/dispatcher.rb

@@ -209,7 +209,11 @@ module RightScale
           @pending_dispatches += 1
           @last_request_dispatch_time = received_at.to_i
           @dispatched.store(token) if @dup_check && !shared && request.kind_of?(Request) && token
-          actor.__send__(method, request.payload)
+          if actor.method(method).arity == 1
+            actor.__send__(method, request.payload)
+          else
+            actor.__send__(method, request.payload, request)
+          end
         rescue Exception => e
           @pending_dispatches = [@pending_dispatches - 1, 0].max
           handle_exception(actor, method, request, e)

data/right_agent.gemspec

@@ -24,8 +24,8 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name      = 'right_agent'
-  spec.version   = '0.9.6'
-  spec.date      = '2012-03-23'
+  spec.version   = '0.9.7'
+  spec.date      = '2012-04-04'
   spec.authors   = ['Lee Kirchhoff', 'Raphael Simon', 'Tony Spataro']
   spec.email     = 'lee@rightscale.com'
   spec.homepage  = 'https://github.com/rightscale/right_agent'

data/spec/dispatcher_spec.rb

@@ -35,6 +35,10 @@ class Foo
     ['hello', payload]
   end
 
+  def bar2(payload, request)
+    ['hello', payload, request]
+  end
+
   def i_kill_you(payload)
     raise RuntimeError.new('I kill you!')
   end
@@ -192,6 +196,14 @@ describe "RightScale::Dispatcher" do
     res.results.should == ['hello', 'you']
   end
 
+  it "should dispatch a request with required arity" do
+    req = RightScale::Request.new('/foo/bar2', 'you', :token => 'token')
+    res = @dispatcher.dispatch(req)
+    res.should(be_kind_of(RightScale::Result))
+    res.token.should == 'token'
+    res.results.should == ['hello', 'you', req]
+  end
+
   it "should dispatch a request to the default action" do
     req = RightScale::Request.new('/foo', 'you', :token => 'token')
     res = @dispatcher.dispatch(req)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: right_agent
 version: !ruby/object:Gem::Version 
-  hash: 55
+  hash: 53
   prerelease: false
   segments: 
   - 0
   - 9
-  - 6
-  version: 0.9.6
+  - 7
+  version: 0.9.7
 platform: ruby
 authors: 
 - Lee Kirchhoff
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-23 00:00:00 -07:00
+date: 2012-04-04 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency