Changeset 4497

Timestamp:

06/27/06 19:41:14 (2 years ago)

Author:

marcel

Message:

Fix invoke_layered since api_method didn't declare :expects. Closes #4720. [Kevin Ballard <kevin@sb.org>, Kent Sibilev]

Files:

• trunk/actionwebservice/CHANGELOG (modified) (1 diff)
• trunk/actionwebservice/lib/action_web_service/test_invoke.rb (modified) (1 diff)
• trunk/actionwebservice/test/test_invoke_test.rb (modified) (4 diffs)

trunk/actionwebservice/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Fix invoke_layered since api_method didn't declare :expects. Closes #4720. [Kevin Ballard <kevin@sb.org>, Kent Sibilev]
-
-* Replace alias method chaining with Module#alias_method_chain. [Marcel Molina Jr.]

trunk/actionwebservice/lib/action_web_service/test_invoke.rb

@@ -53 +53 @@
-          protocol.register_api(api)
-          method = api.api_methods[api_method_name.to_sym]
-unless args.length =
+if method && method.expects && args.length !
-          protocol.encode_request(public_method_name(service_name, api_method_name), args.dup, method.expects)
-        end

trunk/actionwebservice/test/test_invoke_test.rb

@@ -3 +3 @@
-
-class TestInvokeAPI < ActionWebService::API::Base
+  api_method :null
-  api_method :add, :expects => [:int, :int], :returns => [:int]
-end
@@ -14 +15 @@
-    @invoked = true
-    a + b
+  end
+  
+  def null
-  end
-end
@@ -29 +33 @@
-    @invoked = true
-    @method_params[0] + @method_params[1]
+  end
+
+  def null
-  end
-end
@@ -98 +105 @@
-  end
-  
+  def test_with_no_parameters_declared
+    @controller = TestInvokeDirectController.new
+    assert_nil invoke(:null)
+  end
+  
-end