Updating the cast_to_structured_type method to prevent 'casting' subclasses of the parameter type in the API signature. Allows keeping a Cat < Animal a Cat when passed into a service method that expects an Animal.

Signed-off-by: datanoise <[email protected]>

Author: Jason Fox

lib/action_web_service/casting.rb

@@ -117,8 +117,13 @@ def cast_base_type(value, signature_type) # :nodoc:
 
         def cast_to_structured_type(value, signature_type) # :nodoc:
           obj = nil
-          obj = value if canonical_type(value.class) == canonical_type(signature_type.type)
-          obj ||= signature_type.type_class.new
+          # if the canonical classes are the same or if the given value is of 
+          # a type that is derived from the signature_type do not attempt to 
+          # "cast" the value into the signature_type as it's already good to go
+          obj = (
+            canonical_type(value.class) == canonical_type(signature_type.type) or 
+            derived_from?(signature_type.type, value.class)
+          ) ? value : signature_type.type_class.new
           if value.respond_to?(:each_pair)
             klass = signature_type.type_class
             value.each_pair do |name, val|

test/casting_test.rb

@@ -1,6 +1,8 @@
 require File.dirname(__FILE__) + '/abstract_unit'
 
 module CastingTest
+  class A < ActionWebService::Struct; end
+  class B < A; end
   class API < ActionWebService::API::Base
     api_method :int,       :expects => [:int]
     api_method :str,       :expects => [:string]
@@ -14,6 +16,8 @@ class API < ActionWebService::API::Base
     api_method :int_array,   :expects => [[:int]]
     api_method :str_array,   :expects => [[:string]]
     api_method :bool_array,  :expects => [[:bool]]
+    
+    api_method :a, :expects => [A]
   end
 end
 
@@ -78,6 +82,10 @@ def test_array_type_casting_failure
       cast_expects(:int_array, ['1', '2.021', '4'])
     end
   end
+  
+  def test_structured_type_casting_with_polymorphism
+    assert cast_expects(:a, B.new)[0].is_a?(B)
+  end
 
   private
     def cast_expects(method_name, *args)