wash_out 0.3.6 → 0.4.0

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 0.4.0
+
+* Better content-type for the response (#33) [@inossidabile][]
+* Date type support (#18) [@inossidabile][]
+* Avoid duplication of inner types [@inossidabile][]
+* Output camelization support [@inossidabile][]
+* External types declaration support (#21, #41) [@inossidabile][]
+
+## 0.3.7
+
+* Better empty parameters handling (#26, #30) [@rngtng][]
+
 ## 0.3.6
 
 * Unicorn stream reading bug (#20)
@@ -37,3 +49,6 @@
 * The syntax for empty set (no input params or output params) changed from [] to nil.
 * SOAP response format improved. All results are now wrapped into tns:messages instead of soap:Body.
 * Arrays (minOccurs/maxOccurs) are now supported with `:foo => [:integer]` syntax.
+
+[@inossidabile]: https://twitter.com/#!/_inossidabile
+[@rngtng]: https://github.com/rngtng

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    wash_out (0.3.5)
+    wash_out (0.4.0)
       nori
 
 GEM

data/README.md

@@ -122,6 +122,38 @@ result.to_hash # => {:value=>"123abc"}
 
 Take a look at [WashOut sample application](https://github.com/roundlake/wash_out-sample).
 
+Reusable types
+---------
+
+Basic inline types definition is fast and furious for the simple cases. You have an option to describe SOAP types
+inside separate classes for the complex ones. Here's the way to do that:
+
+```ruby
+class Fluffy < WashOut::Type
+  map(
+    :universe => {
+      :name => :string,
+      :age  => :int
+    }
+  )
+end
+
+class FluffyContainer < WashOut::Type
+  type_name 'fluffy_con'
+  map :fluffy => Fluffy
+end
+```
+
+To use defined type inside your inline declaration, pass the class instead of type symbol (`:fluffy => Fluffy`).
+
+Note that WashOut extends the `ActiveRecord` so every model you use is already a WashOut::Type and can be used
+inside your interface declarations.
+
+.Net C# interoperability
+---------
+
+Please note that .Net clients require you to use :int instead of :integer 
+
 Configuration
 ---------
 
@@ -130,7 +162,9 @@ Use `config.wash_out...` inside your environment configuration to setup WashOut.
 Available properties are:
 
 * **namespace**: SOAP namespace to use. Default is `urn:WashOut`.
-* **snakecase**: Determines if WashOut should modify parameters keys to snakecase. Default is true.
+* **snakecase**: *(DEPRECATED SINCE 0.4.0)* Determines if WashOut should modify parameters keys to snakecase. Default is `false`.
+* **snakecase_input**: Determines if WashOut should modify parameters keys to snakecase. Default is `false`.
+* **camelize_wsdl**: Determinse if WashOut should camelize types within WSDL and responses. Default is `false`.
 
 Credits
 -------
@@ -140,6 +174,12 @@ Credits
 * Boris Staal ([@_inossidabile](http://twitter.com/#!/_inossidabile))
 * Peter Zotov ([@whitequark](http://twitter.com/#!/whitequark))
 
+Contributors
+------------
+
+* Björn Nilsson ([@Bjorn-Nilsson](https://github.com/Bjorn-Nilsson))
+* Tobias Bielohlawek ([@rngtng](https://github.com/rngtng))
+
 LICENSE
 -------
 

data/app/helpers/wash_out_helper.rb

@@ -7,6 +7,7 @@ module WashOutHelper
         if !param.multiplied
           xml.tag! tag_name, param.value, "xsi:type" => param.namespaced_type
         else
+          param.value = [] unless param.value.is_a?(Array)
           param.value.each do |v|
             xml.tag! tag_name, v, "xsi:type" => param.namespaced_type
           end
@@ -27,22 +28,28 @@ module WashOutHelper
     end
   end
 
-  def wsdl_type(xml, param)
+  def wsdl_type(xml, param, defined=[])
     more = []
 
     if param.struct?
-      xml.tag! "xsd:complexType", :name => param.name do
-        xml.tag! "xsd:sequence" do
-          param.map.each do |value|
-            more << value if value.struct?
-            xml.tag! "xsd:element", wsdl_occurence(value, false, :name => value.name, :type => value.namespaced_type)
+      if !defined.include?(param.basic_type)
+        xml.tag! "xsd:complexType", :name => param.basic_type do
+          xml.tag! "xsd:sequence" do
+            param.map.each do |value|
+              more << value if value.struct?
+              xml.tag! "xsd:element", wsdl_occurence(value, false, :name => value.name, :type => value.namespaced_type)
+            end
           end
         end
+
+        defined << param.basic_type
+      elsif !param.classified?
+        raise RuntimeError, "Duplicate use of `#{param.basic_type}` type name. Consider using classified types."
       end
     end
 
     more.each do |p|
-      wsdl_type xml, p
+      wsdl_type xml, p, defined
     end
   end
 

data/app/views/wash_with_soap/response.builder

@@ -1,9 +1,12 @@
 xml.instruct!
 xml.tag! "soap:Envelope", "xmlns:soap" => 'http://schemas.xmlsoap.org/soap/envelope/',
-             "xmlns:xsi" => 'http://www.w3.org/2001/XMLSchema-instance',
-             "xmlns:tns" => @namespace do
+                          "xmlns:xsd" => 'http://www.w3.org/2001/XMLSchema',
+                          "xmlns:xsi" => 'http://www.w3.org/2001/XMLSchema-instance',
+                          "xmlns:tns" => @namespace do
   xml.tag! "soap:Body" do
-    xml.tag! "tns:#{@operation}_response" do
+    key = "tns:#{@operation}#{WashOut::Engine.camelize_wsdl ? 'Response' : '_response'}"
+
+    xml.tag! key do
       wsdl_data xml, result
     end
   end

data/app/views/wash_with_soap/wsdl.builder

@@ -10,9 +10,10 @@ xml.definitions 'xmlns' => 'http://schemas.xmlsoap.org/wsdl/',
                 'targetNamespace' => @namespace do
   xml.types do
     xml.tag! "schema", :targetNamespace => @namespace, :xmlns => 'http://www.w3.org/2001/XMLSchema' do
+      defined = []
       @map.each do |operation, formats|
         (formats[:in] + formats[:out]).each do |p|
-          wsdl_type xml, p
+          wsdl_type xml, p, defined
         end
       end
     end

data/lib/wash_out.rb

@@ -3,18 +3,24 @@ require 'wash_out/param'
 require 'wash_out/dispatcher'
 require 'wash_out/soap'
 require 'wash_out/router'
+require 'wash_out/type'
+require 'wash_out/model'
 
 module ActionDispatch::Routing
   class Mapper
     # Adds the routes for a SOAP endpoint at +controller+.
     def wash_out(controller_name, options={})
+      options.reverse_merge!(@scope) if @scope
+      controller_class_name = [options[:module], controller_name].compact.join("/")
+
       match "#{controller_name}/wsdl" => "#{controller_name}#_generate_wsdl", :via => :get
-      match "#{controller_name}/action" => WashOut::Router.new(controller_name), :defaults => { :action => '_action' }
+      match "#{controller_name}/action" => WashOut::Router.new(controller_class_name), :defaults => { :action => '_action' }
     end
   end
 end
 
 Mime::Type.register "application/soap+xml", :soap
+ActiveRecord::Base.send :extend, WashOut::Model
 
 ActionController::Renderers.add :soap do |what, options|
   _render_soap(what, options)
@@ -25,4 +31,4 @@ module ActionView
     cattr_accessor :washout_namespace
     @@washout_namespace = false
   end
-end
+end

data/lib/wash_out/dispatcher.rb

@@ -11,23 +11,29 @@ module WashOut
 
     # This filter parses the SOAP request and puts it into +params+ array.
     def _parse_soap_parameters
-      soap_action = request.env['wash_out.soap_action']
-      action_spec = self.class.soap_actions[soap_action]
-
       # Do not interfere with project-space Nori setup
       strip   = Nori.strip_namespaces?
       convert = Nori.convert_tags?
       Nori.strip_namespaces = true
 
-      if WashOut::Engine.snakecase
+      if WashOut::Engine.snakecase_input
         Nori.convert_tags_to { |tag| tag.snakecase.to_sym }
       else
         Nori.convert_tags_to { |tag| tag.to_sym }
       end
 
-      params = Nori.parse(request.body.read)
+      @_params = Nori.parse(request.body.read)
+
+      # Reset Nori setup to project-space
+      Nori.strip_namespaces = strip
+      Nori.convert_tags_to convert
+    end
+
+    def _map_soap_parameters
+      soap_action = request.env['wash_out.soap_action']
+      action_spec = self.class.soap_actions[soap_action]
 
-      xml_data = params.values_at(:envelope, :Envelope).compact.first
+      xml_data = @_params.values_at(:envelope, :Envelope).compact.first
       xml_data = xml_data.values_at(:body, :Body).compact.first
       xml_data = xml_data.values_at(soap_action.underscore.to_sym, soap_action.to_sym).compact.first || {}
 
@@ -49,17 +55,13 @@ module WashOut
 
       xml_data = strip_empty_nodes.call(xml_data)
 
-      # Reset Nori setup to project-space
-      Nori.strip_namespaces = strip
-      Nori.convert_tags_to convert
-
       @_params = HashWithIndifferentAccess.new
 
       action_spec[:in].each do |param|
-        key = param.name.to_sym
+        key = param.raw_name.to_sym
 
         if xml_data.has_key? key
-          @_params[param.name] = param.load(xml_data, key)
+          @_params[param.raw_name] = param.load(xml_data, key)
         end
       end
     end
@@ -90,15 +92,16 @@ module WashOut
 
           # Inline complex structure
           if param.struct? && !param.multiplied
-            result_spec[i].map = inject.call(data[param.name], param.map)
+            result_spec[i].map = inject.call(data[param.raw_name], param.map)
 
           # Inline array of complex structures
           elsif param.struct? && param.multiplied
-            result_spec[i].map = data[param.name].map{|e| inject.call(e, param.map)}
+            data ||= {} #fallback in case no data is given
+            data[param.raw_name] = [] unless data[param.raw_name].is_a?(Array)
+            result_spec[i].map = data[param.raw_name].map{|e| inject.call(e, param.map)}
 
           else
-            result_spec[i].value = data[param.name]
-
+            result_spec[i].value = data[param.raw_name]
           end
         end
 
@@ -106,7 +109,8 @@ module WashOut
       }
 
       render :template => 'wash_with_soap/response',
-             :locals => { :result => inject.call(result, action_spec) }
+             :locals => { :result => inject.call(result, action_spec) },
+             :content_type => 'text/xml'
     end
 
     # This action is a fallback for all undefined SOAP actions.
@@ -120,7 +124,8 @@ module WashOut
     # exception from a rescue_from handler. Hence this function is a public API.
     def render_soap_error(message)
       render :template => 'wash_with_soap/error', :status => 500,
-             :locals => { :error_message => message }
+             :locals => { :error_message => message },
+             :content_type => 'text/xml'
     end
 
     private
@@ -129,6 +134,7 @@ module WashOut
       controller.send :rescue_from, SOAPError, :with => :_render_soap_exception
       controller.send :helper, :wash_out
       controller.send :before_filter, :_parse_soap_parameters, :except => [ :_generate_wsdl, :_invalid_action ]
+      controller.send :before_filter, :_map_soap_parameters, :except => [ :_generate_wsdl, :_invalid_action ]
     end
 
     def _render_soap_exception(error)

data/lib/wash_out/engine.rb

@@ -2,11 +2,14 @@ module WashOut
   class Engine < ::Rails::Engine
     class << self
       attr_accessor :namespace
-      attr_accessor :snakecase
+      attr_accessor :snakecase, :snakecase_input, :camelize_wsdl
     end
 
     self.namespace = 'urn:WashOut'
-    self.snakecase = false
+    self.snakecase = nil
+
+    self.snakecase_input = false
+    self.camelize_wsdl   = false
 
     config.wash_out = ActiveSupport::OrderedOptions.new
 
@@ -14,6 +17,10 @@ module WashOut
       app.config.wash_out.each do |key, value|
         self.class.send "#{key}=", value
       end
+
+      unless self.class.snakecase.nil?
+        raise "Usage of wash_out.snakecase is deprecated. You should use wash_out.snakecase_input and wash_out.camelize_wsdl"
+      end
     end
   end
 end

data/lib/wash_out/model.rb

@@ -0,0 +1,25 @@
+module WashOut
+  module Model
+    def wash_out_param_map
+      types = {
+        :text      => :string,
+        :float     => :double,
+        :decimal   => :double,
+        :timestamp => :string
+      }
+      map = {}
+
+      columns_hash.each do |key, column|
+        type = column.type
+        type = types[type] if types.has_key?(type)
+        map[key] = type
+      end
+
+      map
+    end
+
+    def wash_out_param_name
+      return name.underscore
+    end
+  end
+end

data/lib/wash_out/param.rb

@@ -1,10 +1,12 @@
 module WashOut
   class Param
+    attr_accessor :raw_name
     attr_accessor :name
     attr_accessor :map
     attr_accessor :type
     attr_accessor :multiplied
     attr_accessor :value
+    attr_accessor :source_class
 
     # Defines a WSDL parameter with name +name+ and type specifier +type+.
     # The type specifier format is described in #parse_def.
@@ -12,11 +14,22 @@ module WashOut
       type ||= {}
 
       @name       = name.to_s
+      @raw_name   = name.to_s
       @map        = {}
       @multiplied = multiplied
 
+      if WashOut::Engine.camelize_wsdl.to_s == 'lower'
+        @name = @name.camelize(:lower)
+      elsif WashOut::Engine.camelize_wsdl
+        @name = @name.camelize
+      end
+
       if type.is_a?(Symbol)
         @type = type.to_s
+      elsif type.is_a?(Class)
+        @type         = 'struct'
+        @map          = self.class.parse_def(type.wash_out_param_map)
+        @source_class = type
       else
         @type = 'struct'
         @map  = self.class.parse_def(type)
@@ -47,10 +60,13 @@ module WashOut
         end
       else
         operation = case type
-          when 'string';  :to_s
-          when 'integer'; :to_i
-          when 'double';  :to_f
-          when 'boolean'; nil # Nori handles that for us
+          when 'string';    :to_s
+          when 'integer';   :to_i
+          when 'double';    :to_f
+          when 'boolean';   nil # Nori handles that for us
+          when 'date';      :to_date
+          when 'datetime';  :to_datetime
+          when 'time';      :to_time
           else raise RuntimeError, "Invalid WashOut simple type: #{type}"
         end
 
@@ -69,9 +85,23 @@ module WashOut
       type == 'struct'
     end
 
+    def classified?
+      !source_class.nil?
+    end
+
+    def basic_type
+      return name unless classified?
+      return source_class.wash_out_param_name
+    end
+
+    def xsd_type
+      return 'dateTime' if type.to_s == 'datetime'
+      return type
+    end
+
     # Returns a WSDL namespaced identifier for this type.
     def namespaced_type
-      struct? ? "tns:#{name}" : "xsd:#{type}"
+      struct? ? "tns:#{basic_type}" : "xsd:#{xsd_type}"
     end
 
     # Parses a +definition+. The format of the definition is best described
@@ -94,7 +124,7 @@ module WashOut
       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)
+      if [Array, Symbol, Class].include?(definition.class)
         definition = { :value => definition }
       end
 
@@ -109,12 +139,14 @@ module WashOut
           end
         end
       else
-        raise RuntimeError, "Wrong definition: #{type.inspect}"
+        raise RuntimeError, "Wrong definition: #{definition.inspect}"
       end
     end
 
     def flat_copy
       copy = self.class.new(@name, @type.to_sym, @multiplied)
+      copy.raw_name = raw_name
+      copy
     end
 
     private
@@ -126,8 +158,8 @@ module WashOut
 
       # RUBY18 Enumerable#each_with_object is better, but 1.9 only.
       @map.map do |param|
-        if data.has_key? param.name
-          struct[param.name] = yield param, data, param.name
+        if data.has_key? param.raw_name
+          struct[param.raw_name] = yield param, data, param.raw_name
         end
       end
 

data/lib/wash_out/router.rb

@@ -9,14 +9,14 @@ module WashOut
     def call(env)
       controller = @controller_name.constantize
 
-      soap_action = env['HTTP_SOAPACTION']
+      if soap_action = env['HTTP_SOAPACTION']
+        # RUBY18 1.8 does not have force_encoding.
+        soap_action.force_encoding('UTF-8') if soap_action.respond_to? :force_encoding
 
-      # RUBY18 1.8 does not have force_encoding.
-      soap_action.force_encoding('UTF-8') if soap_action.respond_to? :force_encoding
+        soap_action.gsub!(/^\"(.*)\"$/, '\1')
 
-      soap_action.gsub!(/^\"(.*)\"$/, '\1')
-
-      env['wash_out.soap_action'] = soap_action
+        env['wash_out.soap_action'] = soap_action
+      end
 
       action_spec = controller.soap_actions[soap_action]
       if action_spec
@@ -28,4 +28,4 @@ module WashOut
       controller.action(action).call(env)
     end
   end
-end
+end

data/lib/wash_out/type.rb

@@ -0,0 +1,21 @@
+module WashOut
+  class Type
+    def self.type_name(value)
+      @param_type_name = value
+    end
+
+    def self.map(value)
+      raise RuntimeError, "Wrong definition: #{value.inspect}" unless value.is_a?(Hash)
+      @param_map = value
+    end
+
+    def self.wash_out_param_map
+      @param_map
+    end
+
+    def self.wash_out_param_name
+      return name.underscore unless @param_type_name
+      @param_type_name
+    end
+  end
+end

data/lib/wash_out/version.rb

@@ -1,3 +1,3 @@
 module WashOut
-  VERSION = "0.3.6"
+  VERSION = "0.4.0"
 end

data/spec/spec_helper.rb

@@ -35,7 +35,7 @@ Dummy::Application.routes.draw do
   wash_out :api
 end
 
-def savon_instance
+def client
   Savon::Client.new do
     wsdl.document = 'http://app/api/wsdl'
   end
@@ -48,4 +48,4 @@ def mock_controller(&block)
 
     class_exec &block if block
   }
-end
+end

data/spec/wash_out/param_spec.rb

@@ -0,0 +1,26 @@
+#encoding:utf-8
+
+require 'spec_helper'
+
+describe WashOut::Param do
+
+  it "loads custom_types" do
+    class Abraka1 < WashOut::Type
+      map(
+        :test => :string
+      )
+    end
+    class Abraka2 < WashOut::Type
+      type_name 'test'
+      map :foo => Abraka1
+    end
+
+    map = WashOut::Param.parse_def Abraka2
+
+    map.should be_a_kind_of(Array)
+    map[0].name.should == 'Value'
+    map[0].map[0].name.should == 'Foo'
+    map[0].map[0].map[0].name.should == 'Test'
+  end
+
+end

data/spec/wash_out/type_spec.rb

@@ -0,0 +1,23 @@
+#encoding:utf-8
+
+require 'spec_helper'
+
+describe WashOut::Type do
+
+  it "defines custom type" do
+    class Abraka1 < WashOut::Type
+      map :test => :string
+    end
+    class Abraka2 < WashOut::Type
+      type_name 'test'
+      map :foo => Abraka1
+    end
+
+    Abraka1.wash_out_param_name.should == 'abraka1'
+    Abraka1.wash_out_param_map.should == {:test => :string}
+
+    Abraka2.wash_out_param_name.should == 'test'
+    Abraka2.wash_out_param_map.should == {:foo => Abraka1}
+  end
+
+end

data/spec/wash_out_spec.rb

@@ -4,7 +4,8 @@ require 'spec_helper'
 
 describe WashOut do
   before(:each) do
-    WashOut::Engine.snakecase = true
+    WashOut::Engine.snakecase_input = true
+    WashOut::Engine.camelize_wsdl   = true
     WashOut::Engine.namespace = false
   end
 
@@ -38,20 +39,25 @@ describe WashOut do
         render :soap => { :area            => Math::PI * circle[:radius] ** 2,
                           :distance_from_o => Math.sqrt(circle[:center][:x] ** 2 + circle[:center][:y] ** 2) }
       end
+
+      soap_action "rocky", :args   => { :circle1 => { :x => :integer } },
+                             :return => { :circle2 => { :y => :integer } }
+      def rocky; end
     end
 
-    client = savon_instance
     xml    = Nori.parse client.wsdl.xml
 
-    # Savon underscores method names so we 
+    # Savon underscores method names so we
     # get back just what we have at controller
-    client.wsdl.soap_actions.should == [:answer, :get_area]
+    client.wsdl.soap_actions.should == [:answer, :get_area, :rocky]
 
-    x = xml[:definitions][:types][:schema][:complex_type].find{|x| x[:'@name'] == 'center'}[:sequence][:element].find{|x| x[:'@name'] == 'x'}
+    x = xml[:definitions][:types][:schema][:complex_type].find{|x| x[:'@name'] == 'Center'}[:sequence][:element].find{|x| x[:'@name'] == 'X'}
     x[:'@min_occurs'].should == "0"
     x[:'@max_occurs'].should == "unbounded"
 
-    xml[:definitions][:binding][:operation].map{|e| e[:'@name']}.should == ['answer', 'getArea']
+    xml[:definitions][:binding][:operation].map{|e| e[:'@name']}.should == ['answer', 'getArea', 'rocky']
+
+    client.wsdl.xml.include?('<xsd:complexType name="Circle1">').should == true
   end
 
   it "should allow definition of a simple action" do
@@ -70,7 +76,6 @@ describe WashOut do
       end
     end
 
-    client = savon_instance
     client.request(:answer).to_hash[:answer_response][:value].should == "42"
   end
 
@@ -82,7 +87,6 @@ describe WashOut do
       end
     end
 
-    client = savon_instance
     client.request(:answer).to_hash[:answer_response][:value].should == "42"
   end
 
@@ -94,7 +98,6 @@ describe WashOut do
       end
     end
 
-    client = savon_instance
     client.request(:answer) do
       soap.body = { :a => '' }
     end.to_hash[:answer_response][:a].should == {:"@xsi:type"=>"xsd:string"}
@@ -108,7 +111,6 @@ describe WashOut do
       end
     end
 
-    client = savon_instance
     client.request(:check_answer) do
       soap.body = { :value => 42 }
     end.to_hash[:check_answer_response][:value].should == true
@@ -118,7 +120,8 @@ describe WashOut do
   end
 
   it "should handle snakecase option properly" do
-    WashOut::Engine.snakecase = false
+    WashOut::Engine.snakecase_input = false
+    WashOut::Engine.camelize_wsdl   = false
 
     mock_controller do
       soap_action "rocknroll", :args => {:ZOMG => :string}, :return => nil
@@ -128,12 +131,49 @@ describe WashOut do
       end
     end
 
-    client = savon_instance
     client.request(:rocknroll) do
       soap.body = { "ZOMG" => 'yam!' }
     end
   end
 
+  context "optional arrays" do
+    it "should answer for simple structure" do
+      mock_controller do
+        soap_action "rocknroll",
+                    :args => nil, :return => { :my_value => [:integer] }
+        def rocknroll
+          render :soap => {}
+        end
+      end
+
+      client.request(:rocknroll).to_hash[:rocknroll_response].should be_nil
+    end
+
+    it "should answer for complex structure" do
+      mock_controller do
+        soap_action "rocknroll",
+                    :args => nil, :return => { :my_value => [{ :value => :integer}] }
+        def rocknroll
+          render :soap => {}
+        end
+      end
+
+      client.request(:rocknroll).to_hash[:rocknroll_response].should be_nil
+    end
+
+    it "should answer for nested complex structure" do
+      mock_controller do
+        soap_action "rocknroll",
+                    :args => nil, :return => { :my_value => { :my_array => [{ :value => :integer}] } }
+        def rocknroll
+          render :soap => {}
+        end
+      end
+
+      client.request(:rocknroll).to_hash[:rocknroll_response][:my_value].should == { :"@xsi:type" => "tns:MyValue" }
+    end
+  end
+
   it "should answer to request with two parameter" do
     mock_controller do
       soap_action "funky", :args => { :a => :integer, :b => :string }, :return => :string
@@ -142,7 +182,6 @@ describe WashOut do
       end
     end
 
-    client = savon_instance
     client.request(:funky) do
       soap.body = { :a => 42, :b => 'k' }
     end.to_hash[:funky_response][:value].should == '420k'
@@ -163,7 +202,6 @@ describe WashOut do
       end
     end
 
-    client = savon_instance
     client.request(:get_area) do
       soap.body = { :circle => { :center => { :x => 3, :y => 4 },
                                  :radius => 5 } }
@@ -181,7 +219,6 @@ describe WashOut do
       end
     end
 
-    client = savon_instance
     client.request(name).to_hash["#{name.underscore}_response".to_sym][:value].should == "forty two"
   end
 
@@ -195,7 +232,6 @@ describe WashOut do
       end
     end
 
-    client = savon_instance
     lambda {
       client.request(:error) do
         soap.body = { :need_error => false }
@@ -211,7 +247,6 @@ describe WashOut do
   it "should report a SOAP error if method does not exists" do
     mock_controller
 
-    client = savon_instance
     lambda {
       client.request(:nonexistent)
     }.should raise_exception(Savon::SOAP::Fault)
@@ -225,7 +260,6 @@ describe WashOut do
       end
     end
 
-    client = savon_instance
     lambda {
       client.request(:error)
     }.should raise_exception(Savon::SOAP::Fault)
@@ -253,7 +287,7 @@ describe WashOut do
       end
     end
 
-    savon_instance.request(:gogogo)[:gogogo_response].should == {:zoo=>"zoo", :boo=>{:moo=>"moo", :doo=>"doo", :"@xsi:type"=>"tns:boo"}}
+    client.request(:gogogo)[:gogogo_response].should == {:zoo=>"zoo", :boo=>{:moo=>"moo", :doo=>"doo", :"@xsi:type"=>"tns:Boo"}}
   end
 
   it "should handle arrays" do
@@ -269,7 +303,7 @@ describe WashOut do
       end
     end
 
-    savon_instance.request(:rumba) do
+    client.request(:rumba) do
       soap.body = {
         :rumbas => [1, 2, 3]
       }
@@ -280,7 +314,7 @@ describe WashOut do
     mock_controller do
       soap_action "rumba",
                   :args   => {
-                    :rumbas => [ { 
+                    :rumbas => [ {
                       :zombies => :string,
                       :puppies => :string
                     } ]
@@ -297,7 +331,7 @@ describe WashOut do
       end
     end
 
-    savon_instance.request(:rumba) do
+    client.request(:rumba) do
       soap.body = {
         :rumbas => [
           {:zombies => 'suck', :puppies => 'rock'},
@@ -317,7 +351,7 @@ describe WashOut do
       end
     end
 
-    savon_instance.request(:rumba).to_hash[:rumba_response].should == {:value => ["1", "2", "3"]}
+    client.request(:rumba).to_hash[:rumba_response].should == {:value => ["1", "2", "3"]}
   end
 
   it "should deprecate old syntax" do
@@ -353,10 +387,10 @@ describe WashOut do
       end
     end
 
-    savon_instance.request(:rumba)[:rumba_response].should == {
+    client.request(:rumba)[:rumba_response].should == {
       :rumbas => [
-        {:zombies => "suck1",:puppies => "rock1", :"@xsi:type"=>"tns:rumbas"},
-        {:zombies => "suck2", :puppies => "rock2", :"@xsi:type"=>"tns:rumbas" }
+        {:zombies => "suck1",:puppies => "rock1", :"@xsi:type"=>"tns:Rumbas"},
+        {:zombies => "suck2", :puppies => "rock2", :"@xsi:type"=>"tns:Rumbas" }
       ]
     }
   end
@@ -372,21 +406,21 @@ describe WashOut do
       end
     end
 
-    savon_instance.request(:rumba)[:rumba_response].should == {
+    client.request(:rumba)[:rumba_response].should == {
       :value => [
         {
           :rumbas => {
             :zombies => "100000",
-            :"@xsi:type" => "tns:rumbas"
+            :"@xsi:type" => "tns:Rumbas"
           },
-          :"@xsi:type" => "tns:value"
+          :"@xsi:type" => "tns:Value"
         },
         {
           :rumbas => {
             :zombies => "2",
-            :"@xsi:type" => "tns:rumbas"
+            :"@xsi:type" => "tns:Rumbas"
           },
-          :"@xsi:type"=>"tns:value"
+          :"@xsi:type"=>"tns:Value"
         }
       ]
     }
@@ -428,31 +462,49 @@ describe WashOut do
       end
     end
 
-    savon_instance.request(:rumba)[:rumba_response].should == {
+    client.request(:rumba)[:rumba_response].should == {
       :rumbas => [
         {
           :zombies => "abc",
           :puppies => [
             {
               :kittens => "1",
-              :"@xsi:type" => "tns:puppies"
+              :"@xsi:type" => "tns:Puppies"
             },
             {
               :kittens => "5",
-              :"@xsi:type" => "tns:puppies"
+              :"@xsi:type" => "tns:Puppies"
             }
           ],
-          :"@xsi:type"=>"tns:rumbas"
+          :"@xsi:type"=>"tns:Rumbas"
         },
         {
           :zombies => "def",
           :puppies => {
             :kittens => "4",
-            :"@xsi:type" => "tns:puppies"
+            :"@xsi:type" => "tns:Puppies"
           },
-          :"@xsi:type"=>"tns:rumbas"
+          :"@xsi:type"=>"tns:Rumbas"
         }
       ]
     }
   end
+
+  it "handles dates" do
+    mock_controller do
+      soap_action "date",
+        :args   => :date,
+        :return => :nil
+      def date
+        params[:value].should == Date.parse('2000-12-30')
+        render :soap => nil
+      end
+    end
+
+    client.request(:date) do
+      soap.body = {
+        :value => '2000-12-30'
+      }
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wash_out
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-06 00:00:00.000000000 Z
+date: 2012-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nori
-  requirement: &70309445502780 !ruby/object:Gem::Requirement
+  requirement: &70304488309860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70309445502780
+  version_requirements: *70304488309860
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70309445499440 !ruby/object:Gem::Requirement
+  requirement: &70304488307640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70309445499440
+  version_requirements: *70304488307640
 - !ruby/object:Gem::Dependency
   name: appraisal
-  requirement: &70309445483420 !ruby/object:Gem::Requirement
+  requirement: &70304488307020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70309445483420
+  version_requirements: *70304488307020
 - !ruby/object:Gem::Dependency
   name: tzinfo
-  requirement: &70309457795880 !ruby/object:Gem::Requirement
+  requirement: &70304488305960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70309457795880
+  version_requirements: *70304488305960
 - !ruby/object:Gem::Dependency
   name: savon
-  requirement: &70309457794620 !ruby/object:Gem::Requirement
+  requirement: &70304488303260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,7 +66,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70309457794620
+  version_requirements: *70304488303260
 description: Dead simple Rails 3 SOAP server library
 email: boris@roundlake.ru
 executables: []
@@ -94,9 +94,11 @@ files:
 - lib/wash_out.rb
 - lib/wash_out/dispatcher.rb
 - lib/wash_out/engine.rb
+- lib/wash_out/model.rb
 - lib/wash_out/param.rb
 - lib/wash_out/router.rb
 - lib/wash_out/soap.rb
+- lib/wash_out/type.rb
 - lib/wash_out/version.rb
 - spec/dummy/Rakefile
 - spec/dummy/app/controllers/application_controller.rb
@@ -123,6 +125,8 @@ files:
 - spec/dummy/script/rails
 - spec/spec_helper.rb
 - spec/support/httpi-rack.rb
+- spec/wash_out/param_spec.rb
+- spec/wash_out/type_spec.rb
 - spec/wash_out_spec.rb
 - wash_out.gemspec
 homepage: http://roundlake.github.com/wash_out/