wash_out 0.3.0 → 0.3.1

data/README.md

@@ -41,6 +41,7 @@ demonstrated.
 class RumbasController < ApplicationController
   include WashOut::SOAP
 
+  # Simple case
   soap_action "integer_to_string",
               :args   => :integer,
               :return => :string
@@ -55,6 +56,7 @@ class RumbasController < ApplicationController
     render :soap => (params[:a] + params[:b])
   end
 
+  # Complex structures
   soap_action "AddCircle",
               :args   => { :circle => { :center => { :x => :integer,
                                                      :y => :integer },
@@ -71,6 +73,14 @@ class RumbasController < ApplicationController
     render :soap => nil
   end
 
+  # Arrays
+  soap_action "integers_to_boolean",
+              :args => { :data => [:integer] },
+              :return => [:boolean]
+  def integers_to_boolean
+    render :soap => params[:data].map{|x| x ? 1 : 0}
+  end
+
   # You can use all Rails features like filtering, too. A SOAP controller
   # is just like a normal controller with a special routing.
   before_filter :dump_parameters

data/lib/wash_out/dispatcher.rb

@@ -7,7 +7,7 @@ module WashOut
   module Dispatcher
     # Default Type namespace
     NAMESPACE = 'urn:WashOut'
-    
+
     # A SOAPError exception can be raised to return a correct SOAP error
     # response.
     class SOAPError < Exception; end
@@ -17,12 +17,18 @@ module WashOut
       soap_action = request.env['wash_out.soap_action']
       action_spec = self.class.soap_actions[soap_action]
 
-      strip = Nori.strip_namespaces?
-
+      # Do not interfere with project-space Nori setup
+      strip   = Nori.strip_namespaces?
+      convert = Nori.convert_tags?
       Nori.strip_namespaces = true
+      Nori.convert_tags_to { |tag| tag.snakecase.to_sym }
+
       params = Nori.parse(request.body)
       xml_data = params[:envelope][:body][soap_action.underscore.to_sym]
+
+      # Reset Nori setup to project-space
       Nori.strip_namespaces = strip
+      Nori.convert_tags_to convert
 
       @_params = HashWithIndifferentAccess.new
       (xml_data || {}).map do |opt, value|
@@ -52,7 +58,7 @@ module WashOut
 
       result = { 'value' => result } unless result.is_a? Hash
       result = HashWithIndifferentAccess.new(result)
-      
+
       inject = lambda {|data, spec|
         spec.each do |param|
           if param.struct?

data/lib/wash_out/param.rb

@@ -31,7 +31,13 @@ module WashOut
       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 @@ module WashOut
           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 @@ module WashOut
     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 @@ module WashOut
         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 @@ module WashOut
     # 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

data/lib/wash_out/version.rb

@@ -1,3 +1,3 @@
 module WashOut
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/spec/wash_out_spec.rb

@@ -34,7 +34,7 @@ describe WashOut do
                           :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 @@ describe WashOut do
 
   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 @@ describe WashOut do
       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 @@ describe WashOut do
         }
       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,29 +220,58 @@ describe WashOut do
         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",
                   :args   => nil,
-                  :return => {
-                    :rumbas => [:integer]
-                  }
+                  :return => [:integer]
       def rumba
-        render :soap => {:rumbas => [1, 2, 3]}
+        render :soap => [1, 2, 3]
       end
     end
-    
-    savon_instance.request(:rumba).to_hash[:rumba_response].should == {:rumbas => ["1", "2", "3"]}
+
+    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)
@@ -258,5 +287,5 @@ describe WashOut do
       end
     end
   end
-  
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wash_out
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-22 00:00:00.000000000 Z
+date: 2012-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nori
-  requirement: &70332337988240 !ruby/object:Gem::Requirement
+  requirement: &70307076083660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70332337988240
+  version_requirements: *70307076083660
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70332337984940 !ruby/object:Gem::Requirement
+  requirement: &70307076083140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70332337984940
+  version_requirements: *70307076083140
 - !ruby/object:Gem::Dependency
   name: appraisal
-  requirement: &70332346016840 !ruby/object:Gem::Requirement
+  requirement: &70307076082660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70332346016840
+  version_requirements: *70307076082660
 - !ruby/object:Gem::Dependency
   name: tzinfo
-  requirement: &70332346016420 !ruby/object:Gem::Requirement
+  requirement: &70307076081960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70332346016420
+  version_requirements: *70307076081960
 - !ruby/object:Gem::Dependency
   name: savon
-  requirement: &70332346016000 !ruby/object:Gem::Requirement
+  requirement: &70307076081100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,7 +66,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70332346016000
+  version_requirements: *70307076081100
 description: Dead simple Rails 3 SOAP server library
 email: boris@roundlake.ru
 executables: []