0
@@ -1,3 +1,7 @@
0
+*0.7.0* (Unreleased)
0
+
0
+* Allow method declarations for direct dispatching to declare parameters as well. We treat an arity of < 0 or > 0 as an indication that we should send through parameters. Closes #939.
0
+  
0
 *0.6.1* (22th March, 2005)
0
 
0
 * Fix that method response QNames mismatched with that declared in the WSDL, makes SOAP::WSDLDriverFactory work against AWS again

0
@@ -27,9 +27,9 @@ begin
0
   require 'active_record'
0
 rescue LoadError
0
   require 'rubygems'
0
-  require_gem 'activesupport', '>= 0.9.0'
0
-  require_gem 'actionpack', '>= 1.4.0'
0
-  require_gem 'activerecord', '>= 1.6.0'
0
+  require_gem 'activesupport', '>= 1.0.2'
0
+  require_gem 'actionpack', '>= 1.6.0'
0
+  require_gem 'activerecord', '>= 1.9.0'
0
 end
0
 
0
 $:.unshift(File.dirname(__FILE__) + "/action_web_service/vendor/")

0
@@ -34,7 +34,12 @@ module ActionWebService # :nodoc:
0
       
0
         def web_service_direct_invoke(invocation)
0
           @method_params = invocation.method_ordered_params
0
-          return_value = self.__send__(invocation.api_method_name)
0
+          arity = method(invocation.api_method_name).arity rescue 0
0
+          if arity < 0 || arity > 0
0
+            return_value = self.__send__(invocation.api_method_name, *@method_params)
0
+          else
0
+            return_value = self.__send__(invocation.api_method_name)
0
+          end
0
           if invocation.api.has_api_method?(invocation.api_method_name)
0
             returns = invocation.returns ? invocation.returns[0] : nil
0
           else

0
@@ -40,6 +40,7 @@ module DispatcherTest
0
 
0
   class DirectAPI < ActionWebService::API::Base
0
     api_method :add, :expects => [{:a=>:int}, {:b=>:int}], :returns => [:int]
0
+    api_method :add2, :expects => [{:a=>:int}, {:b=>:int}], :returns => [:int]
0
     api_method :before_filtered
0
     api_method :after_filtered, :returns => [[:int]]
0
     api_method :struct_return, :returns => [[Node]]
0
@@ -141,6 +142,7 @@ module DispatcherTest
0
     after_filter :alwaysok, :only => [:after_filtered]
0
 
0
     attr :added
0
+    attr :added2
0
     attr :before_filter_called
0
     attr :before_filter_target_called
0
     attr :after_filter_called
0
@@ -159,6 +161,10 @@ module DispatcherTest
0
       @added = @params['a'] + @params['b']
0
     end
0
 
0
+    def add2(a, b)
0
+      @added2 = a + b
0
+    end
0
+
0
     def before_filtered
0
       @before_filter_target_called = true
0
     end
0
@@ -212,6 +218,8 @@ module DispatcherCommonTests
0
   def test_direct_dispatching
0
     assert_equal(70, do_method_call(@direct_controller, 'Add', 20, 50))
0
     assert_equal(70, @direct_controller.added)
0
+    assert_equal(50, do_method_call(@direct_controller, 'Add2', 25, 25))
0
+    assert_equal(50, @direct_controller.added2)
0
     assert(@direct_controller.void_called == false)
0
     case @encoder
0
     when WS::Encoding::SoapRpcEncoding

0
@@ -2,6 +2,18 @@ $:.unshift(File.dirname(__FILE__) + '/apis')
0
 require File.dirname(__FILE__) + '/abstract_dispatcher'
0
 require 'wsdl/parser'
0
 
0
+class ActionController::Base
0
+  class << self
0
+    alias :inherited_without_name_error :inherited
0
+    def inherited(child)
0
+      begin
0
+        inherited_without_name_error(child)
0
+      rescue NameError => e
0
+      end
0
+    end
0
+  end
0
+end
0
+
0
 class AutoLoadController < ActionController::Base; end
0
 class FailingAutoLoadController < ActionController::Base; end
0
 class BrokenAutoLoadController < ActionController::Base; end
0
@@ -39,7 +51,7 @@ class TC_DispatcherActionControllerSoap < Test::Unit::TestCase
0
     assert(!AutoLoadController.web_service_api.nil?)
0
     assert(AutoLoadController.web_service_api.has_public_api_method?('Void'))
0
     assert(FailingAutoLoadController.web_service_api.nil?)
0
-    assert_raises(LoadError, NameError) do
0
+    assert_raises(MissingSourceFile) do
0
       FailingAutoLoadController.require_web_service_api :blah
0
     end
0
     assert_raises(ArgumentError) do