Support for arrays of complex structures

lib/wash_out/param.rb

@@ -31,7 +31,13 @@ def load(data)
       data = Array(data) if @multiplied
 
       if struct?
-        map_struct(data) { |param, elem| param.load(elem) }
+        if @multiplied
+          data.map do |x|
+            map_struct(x) { |param, elem| param.load(elem) }
+          end
+        else
+          map_struct(data) { |param, elem| param.load(elem) }
+        end
       else
         operation = case type
           when 'string';  :to_s
@@ -40,10 +46,10 @@ def load(data)
           when 'boolean'; nil # Nori handles that for us
           else raise RuntimeError, "Invalid WashOut simple type: #{type}"
         end
-        
+
         if operation.nil?
           data
-        elsif data.is_a? Array
+        elsif @multiplied
           data.map{|x| x.send(operation)}
         else
           data.send(operation)
@@ -80,7 +86,7 @@ def namespaced_type
     def self.parse_def(definition)
       raise RuntimeError, "[] should not be used in your params. Use nil if you want to mark empty set." if definition == []
       return [] if definition == nil
-      
+
       if [Array, Symbol].include?(definition.class)
         definition = { :value => definition }
       end
@@ -99,7 +105,7 @@ def self.parse_def(definition)
         raise RuntimeError, "Wrong definition: #{type.inspect}"
       end
     end
-    
+
     def clone
       copy = self.class.new(@name, @type.to_sym, @multiplied)
       copy.map = @map.map{|x| x.clone}
@@ -124,7 +130,7 @@ def map_struct(data)
     # Raise an appropriate exception if a required datum is missing.
     def check_if_missing(data)
       if data.nil?
-        raise WashOut::Dispatcher::SOAPError, "Required SOAP parameter #{@name} is missing"
+        raise WashOut::Dispatcher::SOAPError, "Required SOAP parameter '#{@name}' is missing"
       end
     end
   end

spec/wash_out_spec.rb

@@ -34,7 +34,7 @@ def get_area
                           :distance_from_o => Math.sqrt(circle[:center][:x] ** 2 + circle[:center][:y] ** 2) }
       end
     end
-    
+
     client = savon_instance
     xml    = Nori.parse client.wsdl.xml
 
@@ -124,7 +124,7 @@ def get_area
 
   it "should allow arbitrary action names" do
     name = 'AnswerToTheUltimateQuestionOfLifeTheUniverseAndEverything'
-    
+
     mock_controller do
       soap_action name,
                   :args => nil, :return => :integer, :to => :answer
@@ -182,7 +182,7 @@ def error
       client.request(:error)
     }.should raise_exception(Savon::SOAP::Fault)
   end
-  
+
   it "should handle nested returns" do
     mock_controller do
       soap_action "gogogo",
@@ -204,10 +204,10 @@ def gogogo
         }
       end
     end
-    
+
     savon_instance.request(:gogogo)[:gogogo_response].should == {:zoo=>"zoo", :boo=>{:moo=>"moo", :doo=>"doo", :"@xsi:type"=>"tns:boo"}}
   end
-  
+
   it "should handle arrays" do
     mock_controller do
       soap_action "rumba",
@@ -220,14 +220,45 @@ def rumba
         render :soap => nil
       end
     end
-    
+
     savon_instance.request(:rumba) do
       soap.body = {
         :rumbas => [1, 2, 3]
       }
     end
   end
-
+
+  it "should handle complex structures inside arrays" do
+    mock_controller do
+      soap_action "rumba",
+                  :args   => {
+                    :rumbas => [ { 
+                      :zombies => :string,
+                      :puppies => :string
+                    } ]
+                  },
+                  :return => nil
+      def rumba
+        params.should == {
+          "rumbas" => [
+            {"zombies" => 'suck', "puppies" => 'rock'},
+            {"zombies" => 'slow', "puppies" => 'fast'}
+          ]
+        }
+        render :soap => nil
+      end
+    end
+
+    savon_instance.request(:rumba) do
+      soap.body = {
+        :rumbas => [
+          {:zombies => 'suck', :puppies => 'rock'},
+          {:zombies => 'slow', :puppies => 'fast'}
+        ]
+      }
+    end
+  end
+
   it "should be able to return arrays" do
     mock_controller do
       soap_action "rumba",
@@ -237,10 +268,10 @@ def rumba
         render :soap => [1, 2, 3]
       end
     end
-    
+
     savon_instance.request(:rumba).to_hash[:rumba_response].should == {:value => ["1", "2", "3"]}
   end
-  
+
   it "should deprecate old syntax" do
     # save rspec context check
     raise_runtime_exception = raise_exception(RuntimeError)
@@ -256,5 +287,5 @@ def rumba
       end
     end
   end
-  
+
 end