0
@@ -1,5 +1,7 @@
0
 *SVN*
0
 
0
+* Fix soap type registration of multidimensional arrays (#4232)
0
+
0
 * Fix that marshaler couldn't handle ActiveRecord models defined in a different namespace (#2392).
0
 
0
 * Fix that marshaler couldn't handle structs with members of ActiveRecord type (#1889).

0
@@ -40,32 +40,25 @@ module ActionWebService
0
         def register_type(type)
0
           return @type2binding[type] if @type2binding.has_key?(type)
0
 
0
-          type_class = type.array?? type.element_type.type_class : type.type_class
0
-          type_type = type.array?? type.element_type : type
0
-          type_binding = nil
0
-          if (mapping = @registry.find_mapped_soap_class(type_class) rescue nil)
0
-            qname = mapping[2] ? mapping[2][:type] : nil
0
-            qname ||= soap_base_type_name(mapping[0])
0
-            type_binding = SoapBinding.new(self, qname, type_type, mapping)
0
-          else
0
-            qname = XSD::QName.new(@namespace, soap_type_name(type_class.name))
0
-            @registry.add(type_class,
0
-                          SOAP::SOAPStruct,
0
-                          typed_struct_factory(type_class),
0
-                          { :type => qname })
0
-            mapping = @registry.find_mapped_soap_class(type_class)
0
-            type_binding = SoapBinding.new(self, qname, type_type, mapping)
0
-          end
0
-
0
-          array_binding = nil
0
           if type.array?
0
             array_mapping = @registry.find_mapped_soap_class(Array)
0
             qname = XSD::QName.new(@namespace, soap_type_name(type.element_type.type_class.name) + 'Array')
0
-            array_binding = SoapBinding.new(self, qname, type, array_mapping, type_binding)
0
+            element_type_binding = register_type(type.element_type)
0
+            @type2binding[type] = SoapBinding.new(self, qname, type, array_mapping, element_type_binding)
0
+          elsif (mapping = @registry.find_mapped_soap_class(type.type_class) rescue nil)
0
+            qname = mapping[2] ? mapping[2][:type] : nil
0
+            qname ||= soap_base_type_name(mapping[0])
0
+            @type2binding[type] = SoapBinding.new(self, qname, type, mapping)
0
+          else
0
+            qname = XSD::QName.new(@namespace, soap_type_name(type.type_class.name))
0
+            @registry.add(type.type_class,
0
+              SOAP::SOAPStruct,
0
+              typed_struct_factory(type.type_class),
0
+              { :type => qname })
0
+            mapping = @registry.find_mapped_soap_class(type.type_class)
0
+            @type2binding[type] = SoapBinding.new(self, qname, type, mapping)
0
           end
0
 
0
-          @type2binding[type] = array_binding ? array_binding : type_binding
0
-          
0
           if type.structured?
0
             type.each_member do |m_name, m_type|
0
               register_type(m_type)

0
@@ -34,6 +34,10 @@ module ClientTest
0
     member :user, User
0
     member :users, [User]
0
   end
0
+  
0
+  class WithMultiDimArray < ActionWebService::Struct
0
+    member :pref, [[:string]]
0
+  end
0
 
0
   class API < ActionWebService::API::Base
0
     api_method :void
0
@@ -48,6 +52,7 @@ module ClientTest
0
     api_method :user_return,          :returns => [User]
0
     api_method :with_model_return,    :returns => [WithModel]
0
     api_method :scoped_model_return,  :returns => [Accounting::User]
0
+    api_method :multi_dim_return,     :returns => [WithMultiDimArray]
0
   end
0
   
0
   class NullLogOut
0
@@ -124,6 +129,10 @@ module ClientTest
0
     def scoped_model_return
0
       Accounting::User.find(1)
0
     end
0
+    
0
+    def multi_dim_return
0
+      WithMultiDimArray.new :pref => [%w{pref1 value1}, %w{pref2 value2}]
0
+    end
0
   end
0
 
0
   class AbstractClientLet < WEBrick::HTTPServlet::AbstractServlet

0
@@ -29,3 +29,10 @@ ActiveRecord::Base.establish_connection(
0
 ActiveRecord::Base.connection
0
 
0
 Test::Unit::TestCase.fixture_path = "#{File.dirname(__FILE__)}/fixtures/"
0
+
0
+# restore default raw_post functionality
0
+class ActionController::TestRequest
0
+  def raw_post
0
+    super
0
+  end
0
+end
0
\ No newline at end of file

0
@@ -142,4 +142,11 @@ class TC_ClientSoap < Test::Unit::TestCase
0
     assert_kind_of Accounting::User, scoped_model
0
     assert_equal 'Kent', scoped_model.name
0
   end
0
+  
0
+  def test_multi_dim_return
0
+    md_struct = @client.multi_dim_return
0
+    assert_kind_of Array, md_struct.pref
0
+    assert_equal 2, md_struct.pref.size
0
+    assert_kind_of Array, md_struct.pref[0]
0
+  end
0
 end

0
@@ -141,4 +141,11 @@ class TC_ClientXmlRpc < Test::Unit::TestCase
0
     assert_kind_of Accounting::User, scoped_model
0
     assert_equal 'Kent', scoped_model.name
0
   end
0
+
0
+  def test_multi_dim_return
0
+    md_struct = @client.multi_dim_return
0
+    assert_kind_of Array, md_struct.pref
0
+    assert_equal 2, md_struct.pref.size
0
+    assert_kind_of Array, md_struct.pref[0]
0
+  end
0
 end