wash_out 0.10.0 → 0.11.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a23248a1bd38c14fe7eae75c2589b4eb945687f6
-  data.tar.gz: 5f806cadfebf37d0b46ee2d7f69d00266f0bae53
+  metadata.gz: 9d49adf22c0c16c3f0e8e3e2dcf694b7d6851920
+  data.tar.gz: c42b0da56ed90cd44e4d014aff450f3bef83325f
 SHA512:
-  metadata.gz: 5879036aca9ca31804573e45c5cc3aa4f7ffdb5303c27ea195c322c9246afd1ecde6d518783cd6e13dcd49ccb7a29c99f7017bc28a8feb43fbb45afeb2988063
-  data.tar.gz: d791bece6a7eb059ff83dbac5bce07ccd6e7dfc95c761579ff53ff97776dae4c7a5156b76997131f8de931b5263ba846545ec5018daa75eeb66faf985bbb2a6e
+  metadata.gz: 9f2dd4239ee3fa9e449bd0903c977b5f2457382ee363cb3d1404d102f5fd0b531fe8f0e32dcee5cc6a5ff14996d60b37bb565ad702b913ac2ed344fbde90ea83
+  data.tar.gz: c9045dd957a04e6751b9ed5ffc2a28fdc6c1d4a1c4eff7a57d8564699423a442a4975fe8c6c4cac7a451a19cd3eeda112ba8357cd0e19228d838e4d8ffcabdb4

data/.travis.yml

@@ -1,10 +1,10 @@
 script: bundle exec rspec
 gemfile:
-  - gemfiles/rails_3.1.3.gemfile
-  - gemfiles/rails_3.2.12.gemfile
+  - gemfiles/rails_3.2.13.gemfile
   - gemfiles/rails_4.0.0.gemfile
   - gemfiles/rails_4.1.0.gemfile
   - gemfiles/rails_4.2.0.gemfile
+  - gemfiles/rails_5.0.0.beta2.gemfile
 rvm:
   - 1.9.3
   - 2.0.0
@@ -15,12 +15,20 @@ rvm:
 matrix:
   exclude:
     - rvm: 2.2.4
-      gemfile: gemfiles/rails_3.1.3.gemfile
-    - rvm: 2.2.4
-      gemfile: gemfiles/rails_3.2.12.gemfile
-    - rvm: 2.3.0
-      gemfile: gemfiles/rails_3.1.3.gemfile
+      gemfile: gemfiles/rails_3.2.13.gemfile
     - rvm: 2.3.0
-      gemfile: gemfiles/rails_3.2.12.gemfile
+      gemfile: gemfiles/rails_3.2.13.gemfile
+    - rvm: 1.9.3
+      gemfile: gemfiles/rails_4.2.0.gemfile
+    - rvm: jruby
+      gemfile: gemfiles/rails_4.2.0.gemfile
+    - rvm: 1.9.3
+      gemfile: gemfiles/rails_5.0.0.beta2.gemfile
+    - rvm: 2.0.0
+      gemfile: gemfiles/rails_5.0.0.beta2.gemfile
+    - rvm: 2.1.8
+      gemfile: gemfiles/rails_5.0.0.beta2.gemfile
+    - rvm: jruby
+      gemfile: gemfiles/rails_5.0.0.beta2.gemfile
 before_install:
   - gem update bundler

data/Appraisals

@@ -1,21 +1,24 @@
-appraise "rails-3.1.3" do
-  gem "rails", "3.1.3"
-  gem "test-unit"
-end
-
-appraise "rails-3.2.12" do
-  gem "rails", "3.2.12"
+appraise "rails-3.2.13" do
+  gem "rails", "3.2.13"
   gem "test-unit"
+  gem "listen", "< 3.1.0"
 end
 
 appraise "rails-4.0.0" do
   gem "rails", "4.0.0"
+  gem "listen", "< 3.1.0"
 end
 
 appraise "rails-4.1.0" do
   gem "rails", "4.1.0"
+  gem "listen", "< 3.1.0"
 end
 
 appraise "rails-4.2.0" do
   gem "rails", "4.2.0"
+  gem "listen", "< 3.1.0"
 end
+
+appraise "rails-5.0.0.beta2" do
+  gem "rails", "5.0.0.beta2"
+end

data/README.md

@@ -10,11 +10,7 @@ But if you have a chance, please [http://stopsoap.com/](http://stopsoap.com/).
 
 ## Compatibility
 
-Rails >3.0 only. MRI 1.9, 2.0, JRuby (--1.9).
-
-Ruby 1.8 is not officially supported since 0.5.3. We will accept further compatibilty pull-requests but no upcoming versions will be tested against it.
-
-Rubinius support temporarily dropped since 0.6.2 due to Rails 4 incompatibility.
+Rails 3.2.13 and higher (if you are using SOAP and still on Ruby 1.9 - that's just too much evil, sorry)
 
 ## Installation
 
@@ -75,7 +71,7 @@ class RumbasController < ApplicationController
               :args => { :data => [:integer] },
               :return => [:boolean]
   def integers_to_boolean
-    render :soap => params[:data].map{|x| x ? 1 : 0}
+    render :soap => params[:data].map{|i| i > 0}
   end
 
   # Params from XML attributes;
@@ -160,7 +156,7 @@ inside separate classes for the complex ones. Here's the way to do that:
 class Fluffy < WashOut::Type
   map :universe => {
         :name => :string,
-        :age  => :int
+        :age  => :integer
       }
 end
 

data/app/helpers/wash_out_helper.rb

@@ -3,7 +3,11 @@ module WashOutHelper
   def wsdl_data_options(param)
     case controller.soap_config.wsdl_style
     when 'rpc'
-      { :"xsi:type" => param.namespaced_type }
+      if param.map.present? || param.value
+        { :"xsi:type" => param.namespaced_type }
+      else
+        { :"xsi:nil" => true }
+      end
     when 'document'
       { }
     end
@@ -96,11 +100,11 @@ module WashOutHelper
   end
 
   def wsdl_occurence(param, inject, extend_with = {})
-    data = !param.multiplied ? {} : {
-      "#{'xsi:' if inject}minOccurs" => 0,
-      "#{'xsi:' if inject}maxOccurs" => 'unbounded'
-    }
-
+    data = {"#{'xsi:' if inject}nillable" => 'true'}
+    if param.multiplied
+      data["#{'xsi:' if inject}minOccurs"] = 0
+      data["#{'xsi:' if inject}maxOccurs"] = 'unbounded'
+    end
     extend_with.merge(data)
   end
 end

data/app/views/wash_out/document/wsdl.builder

@@ -62,7 +62,7 @@ xml.definitions 'xmlns' => 'http://schemas.xmlsoap.org/wsdl/',
 
   xml.service :name => "service" do
     xml.port :name => "#{@name}_port", :binding => "tns:#{@name}_binding" do
-      xml.tag! "soap:address", :location => send("#{@name}_action_url")
+      xml.tag! "soap:address", :location => WashOut::Router.url(request, @name)
     end
   end
 end

data/app/views/wash_out/rpc/wsdl.builder

@@ -62,7 +62,7 @@ xml.definitions 'xmlns' => 'http://schemas.xmlsoap.org/wsdl/',
 
   xml.service :name => "service" do
     xml.port :name => "#{@name}_port", :binding => "tns:#{@name}_binding" do
-      xml.tag! "soap:address", :location => send("#{@name}_action_url")
+      xml.tag! "soap:address", :location => WashOut::Router.url(request, @name)
     end
   end
 end

data/gemfiles/{rails_3.2.12.gemfile → rails_3.2.13.gemfile}

@@ -14,7 +14,8 @@ gem "tzinfo"
 gem "pry"
 gem "simplecov"
 gem "simplecov-summary"
-gem "rails", "3.2.12"
+gem "rails", "3.2.13"
 gem "test-unit"
+gem "listen", "< 3.1.0"
 
 gemspec :path => "../"

data/gemfiles/rails_4.0.0.gemfile

@@ -15,5 +15,6 @@ gem "pry"
 gem "simplecov"
 gem "simplecov-summary"
 gem "rails", "4.0.0"
+gem "listen", "< 3.1.0"
 
 gemspec :path => "../"

data/gemfiles/rails_4.1.0.gemfile

@@ -15,5 +15,6 @@ gem "pry"
 gem "simplecov"
 gem "simplecov-summary"
 gem "rails", "4.1.0"
+gem "listen", "< 3.1.0"
 
 gemspec :path => "../"

data/gemfiles/rails_4.2.0.gemfile

@@ -15,5 +15,6 @@ gem "pry"
 gem "simplecov"
 gem "simplecov-summary"
 gem "rails", "4.2.0"
+gem "listen", "< 3.1.0"
 
 gemspec :path => "../"

data/gemfiles/{rails_3.1.3.gemfile → rails_5.0.0.beta2.gemfile}

@@ -14,7 +14,6 @@ gem "tzinfo"
 gem "pry"
 gem "simplecov"
 gem "simplecov-summary"
-gem "rails", "3.1.3"
-gem "test-unit"
+gem "rails", "5.0.0.beta2"
 
 gemspec :path => "../"

data/lib/wash_out/dispatcher.rb

@@ -16,9 +16,8 @@ module WashOut
     class ProgrammerError < Exception; end
 
     def _authenticate_wsse
-
       begin
-        xml_security   = env['wash_out.soap_data'].values_at(:envelope, :Envelope).compact.first
+        xml_security   = request.env['wash_out.soap_data'].values_at(:envelope, :Envelope).compact.first
         xml_security   = xml_security.values_at(:header, :Header).compact.first
         xml_security   = xml_security.values_at(:security, :Security).compact.first
         username_token = xml_security.values_at(:username_token, :UsernameToken).compact.first
@@ -69,10 +68,9 @@ module WashOut
 
     # This action generates the WSDL for defined SOAP methods.
     def _generate_wsdl
-
       @map       = self.class.soap_actions
       @namespace = soap_config.namespace
-      @name      = controller_path.gsub('/', '_')
+      @name      = controller_path
 
       render :template => "wash_out/#{soap_config.wsdl_style}/wsdl", :layout => false,
              :content_type => 'text/xml'
@@ -140,6 +138,10 @@ module WashOut
       render_soap_error("Cannot find SOAP action mapping for #{request.env['wash_out.soap_action']}")
     end
 
+    def _invalid_request
+      render_soap_error("Invalid SOAP request")
+    end
+
     def _catch_soap_errors
       yield
     rescue SOAPError => error
@@ -158,36 +160,54 @@ module WashOut
     end
 
     def self.included(controller)
-      controller.send :around_filter, :_catch_soap_errors
+      entity = if defined?(Rails::VERSION::MAJOR) && (Rails::VERSION::MAJOR >= 4)
+        'action'
+      else
+        'filter' 
+      end
+
+      controller.send :"around_#{entity}", :_catch_soap_errors
       controller.send :helper, :wash_out
-      controller.send :before_filter, :_authenticate_wsse,     :except => [
-        :_generate_wsdl, :_invalid_action ]
-      controller.send :before_filter, :_map_soap_parameters,   :except => [
-        :_generate_wsdl, :_invalid_action ]
-      controller.send :skip_before_filter, :verify_authenticity_token
+      controller.send :"before_#{entity}", :_authenticate_wsse,   :if => :soap_action?
+      controller.send :"before_#{entity}", :_map_soap_parameters, :if => :soap_action?
+      controller.send :"skip_before_#{entity}", :verify_authenticity_token
     end
 
-    def self.deep_select(hash, result=[], &blk)
-      result += Hash[hash.select(&blk)].values
+    def self.deep_select(collection, result=[], &blk)
+      values = collection.respond_to?(:values) ? collection.values : collection
+      result += values.select(&blk)
 
-      hash.each do |key, value|
-        result = deep_select(value, result, &blk) if value.is_a? Hash
+      values.each do |value|
+        if value.is_a?(Hash) || value.is_a?(Array)
+          result = deep_select(value, result, &blk)
+        end
       end
 
       result
     end
 
-    def self.deep_replace_href(hash, replace)
-      return replace[hash[:@href]] if hash.has_key?(:@href)
+    def self.deep_replace_href(element, replace)
+      return element unless element.is_a?(Array) || element.is_a?(Hash)
 
-      hash.keys.each do |key, value|
-        hash[key] = deep_replace_href(hash[key], replace) if hash[key].is_a?(Hash)
+      if element.is_a?(Array) # Traverse arrays
+        return element.map{|x| deep_replace_href(x, replace)}
       end
 
-      hash
+      if element.has_key?(:@href) # Replace needle and traverse replacement
+        return deep_replace_href(replace[element[:@href]], replace)
+      end
+
+      element.each do |key, value| # Traverse hashes
+        element[key] = deep_replace_href(value, replace)
+      end
+
+      element
     end
 
     private
+    def soap_action?
+      soap_action.present?
+    end
 
     def action_spec
       self.class.soap_actions[soap_action]
@@ -202,7 +222,7 @@ module WashOut
     end
 
     def xml_data
-      xml_data = env['wash_out.soap_data'].values_at(:envelope, :Envelope).compact.first
+      xml_data = request.env['wash_out.soap_data'].values_at(:envelope, :Envelope).compact.first
       xml_data = xml_data.values_at(:body, :Body).compact.first || {}
       return xml_data if soap_config.wsdl_style == "document"
       xml_data = xml_data.values_at(soap_action.underscore.to_sym, soap_action.to_sym, request_input_tag.to_sym).compact.first || {}

data/lib/wash_out/router.rb

@@ -4,6 +4,26 @@ module WashOut
   # This class is a Rack middleware used to route SOAP requests to a proper
   # action of a given SOAP controller.
   class Router
+    def self.url(request, controller_name)
+      route = Rails.application.routes.routes.select do |x|
+        defaults = x.defaults
+        defaults = defaults[:defaults] if defaults.include?(:defaults) # Rails 5
+        defaults[:controller] == controller_name && defaults[:action] == 'soap'
+      end.first
+
+      path = if route.respond_to?(:optimized_path)      # Rails 4
+        route.optimized_path
+      elsif route.path.respond_to?(:build_formatter)    # Rails 5
+        route.path.build_formatter.evaluate(nil)
+      else
+        route.format({})                                # Rails 3.2
+      end
+
+      path = path.join('') if path.is_a?(Array)
+
+      request.protocol + request.host_with_port + path
+    end
+
     def initialize(controller_name)
       @controller_name = "#{controller_name.to_s}_controller".camelize
     end
@@ -17,15 +37,13 @@ module WashOut
 
       soap_action = controller.soap_config.soap_action_routing ? env['HTTP_SOAPACTION'].to_s.gsub(/^"(.*)"$/, '\1')
                                                                : ''
-
       if soap_action.blank?
         parsed_soap_body = nori(controller.soap_config.snakecase_input).parse(soap_body env)
         return nil if parsed_soap_body.blank?
 
-        soap_action = parsed_soap_body
-            .values_at(:envelope, :Envelope).compact.first
-            .values_at(:body, :Body).compact.first
-            .keys.first.to_s
+        soap_action = parsed_soap_body.values_at(:envelope, :Envelope).try(:compact).try(:first)
+        soap_action = soap_action.values_at(:body, :Body).try(:compact).try(:first) if soap_action
+        soap_action = soap_action.keys.first.to_s if soap_action
       end
 
       # RUBY18 1.8 does not have force_encoding.
@@ -61,9 +79,8 @@ module WashOut
 
     def parse_soap_parameters(env)
       return env['wash_out.soap_data'] if env['wash_out.soap_data']
-
       env['wash_out.soap_data'] = nori(controller.soap_config.snakecase_input).parse(soap_body env)
-      references = WashOut::Dispatcher.deep_select(env['wash_out.soap_data']){|k,v| v.is_a?(Hash) && v.has_key?(:@id)}
+      references = WashOut::Dispatcher.deep_select(env['wash_out.soap_data']){|v| v.is_a?(Hash) && v.has_key?(:@id)}
 
       unless references.blank?
         replaces = {}; references.each{|r| replaces['#'+r[:@id]] = r}
@@ -76,17 +93,19 @@ module WashOut
     def call(env)
       @controller = @controller_name.constantize
 
-      soap_action     = parse_soap_action(env)
-      return [200, {}, ['OK']] if soap_action.blank?
-
-      soap_parameters = parse_soap_parameters(env)
-
-      action_spec = controller.soap_actions[soap_action]
+      soap_action = parse_soap_action(env)
 
-      if action_spec
-        action = action_spec[:to]
+      action = if soap_action.blank?
+        '_invalid_request'
       else
-        action = '_invalid_action'
+        soap_parameters = parse_soap_parameters(env)
+        action_spec     = controller.soap_actions[soap_action]
+
+        if action_spec
+          action_spec[:to]
+        else
+          '_invalid_action'
+        end
       end
 
       controller.action(action).call(env)

data/lib/wash_out/version.rb

@@ -1,3 +1,3 @@
 module WashOut
-  VERSION = "0.10.0"
+  VERSION = "0.11.0.beta.1"
 end

data/lib/wash_out.rb

@@ -21,11 +21,18 @@ module ActionDispatch::Routing
   class Mapper
     # Adds the routes for a SOAP endpoint at +controller+.
     def wash_out(controller_name, options={})
-      options.each_with_index { |key, value|  @scope[key] = value } if @scope
-      controller_class_name = [options[:module], controller_name].compact.join("/")
+      if @scope
+        scope_frame = @scope.respond_to?(:frame) ? @scope.frame : @scope
+        options.each{ |key, value|  scope_frame[key] = value }
+      end
 
-      match "#{controller_name}/wsdl"   => "#{controller_name}#_generate_wsdl", :via => :get, :format => false
-      match "#{controller_name}/action" => WashOut::Router.new(controller_class_name), :via => [:get, :post], :defaults => { :controller => controller_class_name, :action => '_action' }, :format => false
+      controller_class_name = [scope_frame[:module], controller_name].compact.join("/").underscore
+
+      match "#{controller_name}/wsdl"   => "#{controller_name}#_generate_wsdl", :via => :get, :format => false,
+        :as => "#{controller_class_name}_wsdl"
+      match "#{controller_name}/action" => WashOut::Router.new(controller_class_name), :via => [:get, :post],
+        :defaults => { :controller => controller_class_name, :action => 'soap' }, :format => false,
+        :as => "#{controller_class_name}_soap"
     end
   end
 end

data/spec/fixtures/nested_refs_to_arrays.xml

@@ -0,0 +1,19 @@
+<s:Envelope xmlns:s="http://schemas.xmlsoap.org/soap/envelope/">
+  <s:Body s:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    <parent href="#id1" />
+    <q2:child id="id1" xsi:type="q2:child" xmlns:q2="urn:FakeService">
+      <first_list href="#id2" />
+      <second_list href="#id3" />
+    </q2:child>
+    <q3:Array id="id2" q3:arrayType="xsd:int[1]" xmlns:q3="http://schemas.xmlsoap.org/soap/encoding/">
+      <Item>1</Item>
+      <Item>2</Item>
+    </q3:Array>
+    <q4:Array id="id3" q4:arrayType="xsd:int[1]" xmlns:q4="http://schemas.xmlsoap.org/soap/encoding/">
+      <Item>11</Item>
+      <Item>22</Item>
+    </q4:Array>
+  </s:Body>
+</s:Envelope>

data/spec/fixtures/ref_to_one_array.xml

@@ -0,0 +1,11 @@
+<s:Envelope xmlns:s="http://schemas.xmlsoap.org/soap/envelope/">
+  <s:Body s:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    <list href="#id1" />
+    <q1:Array id="id1" q1:arrayType="xsd:int[1]" xmlns:q1="http://schemas.xmlsoap.org/soap/encoding/">
+      <Item>1</Item>
+      <Item>2</Item>
+    </q1:Array>
+  </s:Body>
+</s:Envelope>

data/spec/fixtures/refs_to_arrays.xml

@@ -0,0 +1,16 @@
+<s:Envelope xmlns:s="http://schemas.xmlsoap.org/soap/envelope/">
+  <s:Body s:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    <first_list href="#id1" />
+    <second_list href="#id2" />
+    <q1:Array id="id1" q1:arrayType="xsd:int[1]" xmlns:q1="http://schemas.xmlsoap.org/soap/encoding/">
+      <Item>1</Item>
+      <Item>2</Item>
+    </q1:Array>
+    <q2:Array id="id2" q2:arrayType="xsd:int[1]" xmlns:q2="http://schemas.xmlsoap.org/soap/encoding/">
+      <Item>11</Item>
+      <Item>22</Item>
+    </q2:Array>
+  </s:Body>
+</s:Envelope>

data/spec/lib/wash_out/dispatcher_spec.rb

@@ -12,14 +12,121 @@ describe WashOut::Dispatcher do
     end
   end
 
-  it "finds nested hashes" do
-    expect(WashOut::Dispatcher.deep_select(:foo => 1){|k,v| k == :foo}).to eq [1]
-    expect(WashOut::Dispatcher.deep_select({:foo => {:foo => 1}}){|k,v| k == :foo}).to eq([{:foo => 1}, 1])
+  describe ".deep_select" do
+    blk = lambda{|v| v.is_a?(Hash) && v.has_key?(:@id)}
+
+    it "find no elements if there aren't any ids" do
+      expect(WashOut::Dispatcher.deep_select({k: {v: :v2}}, &blk)).to eq []
+    end
+
+    it "finds elements with ids in a hash" do
+      expect(WashOut::Dispatcher.deep_select({k: {:@id => 5, x: :y}}, &blk)).to eq [{:@id => 5, x: :y}]
+    end
+
+    it "finds elements with ids in a array" do
+      expect(WashOut::Dispatcher.deep_select({k: [{:@id => 5, x: :y}]}, &blk)).to eq [{:@id => 5, x: :y}]
+    end
+
+    it "finds elements with ids in hashes" do
+      expect(WashOut::Dispatcher.deep_select(
+        {
+          k: {:@id => 5, x: :y},
+          k2: {:@id => 6, n: :m}
+        }, &blk)).to eq [{:@id => 5, x: :y}, {:@id => 6, n: :m}]
+    end
+
+    it "finds elements in a hash and in a array" do
+      expect(WashOut::Dispatcher.deep_select(
+        {
+          k: [{:@id => 5, x: :y}],
+          k2: {:@id => 6, n: :m}
+        }, &blk)).to contain_exactly({:@id => 5, x: :y}, {:@id => 6, n: :m})
+    end
+
+    it "finds elements with ids in multiple arrays" do
+      expect(WashOut::Dispatcher.deep_select(
+        {
+          k: [{:@id => 5, x: :y}],
+          k2: [{:@id => 6, n: :m}]
+        }, &blk)).to eq [{:@id => 5, x: :y}, {:@id => 6, n: :m}]
+    end
   end
 
-  it "replaces nested hashed" do
-    expect(WashOut::Dispatcher.deep_replace_href({:foo => {:@href => 1}}, {1 => 2})).to eq({:foo => 2})
-    expect(WashOut::Dispatcher.deep_replace_href({:bar => {:foo => {:@href => 1}}}, {1 => 2})).to eq({:bar => {:foo => 2}})
+  describe ".deep_replace_href" do
+    it "replaces nested hashed" do
+      expect(WashOut::Dispatcher.deep_replace_href(
+        {:foo => {:@href => 1}},
+        {1 => 2})).to eq(
+          {:foo => 2}
+        )
+    end
+
+    it "replaces deeper nested hashes" do
+      expect(WashOut::Dispatcher.deep_replace_href(
+        {:bar => {:foo => {:@href => 1}}},
+        {1 => 2}
+      )).to eq(
+        {:bar => {:foo => 2}}
+      )
+    end
+
+    it "replace nested refs" do
+      hash = {fizz: {:@href => "#id4"}}
+      replaces = {
+        "#id4" => {:@href => "#id6"},
+        "#id6" => {foo: :bar}
+      }
+      expect(WashOut::Dispatcher.deep_replace_href(hash, replaces)).to eq({
+        fizz: {foo: :bar}})
+    end
+
+    it "replace really nested refs" do
+      hash = {fizz: {:@href => "#id4"}}
+      replaces = {
+        "#id4" => {:@href => "#id6"},
+        "#id6" => {:@href => "#id7"},
+        "#id7" => {foo: :bar}
+      }
+      expect(WashOut::Dispatcher.deep_replace_href(hash, replaces)).to eq({
+        fizz: {foo: :bar}})
+    end
+
+    it "replaces arrays in nested hashes" do
+      hash = {
+        fizz: {:@href => "#id4"},
+        Array: [
+          {Item: [{:@href => "#id6"}, {:@href => "#id7"}]},
+          {Item: {loo: :iioo}}
+        ]
+      }
+      replaces = {
+        "#id4" => {Item: [{:@href => "#id6"}, {:@href => "#id7"}]},
+        "#id6" => {foo: :bar},
+        "#id7" => {baz: :bats}
+      }
+      expect(WashOut::Dispatcher.deep_replace_href(hash, replaces)).to eq({
+        fizz: {Item: [
+          {foo: :bar},
+          {baz: :bats}
+        ]},
+        Array: [
+          {Item: [{foo: :bar}, {baz: :bats}]},
+          {Item: {loo: :iioo}}
+        ]
+      })
+    end
+
+    it "can traverse arrays that do not contain hashes" do
+      hash = {
+        fizz: {:@href => "#id1"},
+      }
+      replaces = {
+        "#id1" => {Item: ["1", "2"]},
+      }
+      expect(WashOut::Dispatcher.deep_replace_href(hash, replaces)).to eq({
+        fizz: {Item: ["1", "2"]},
+      })
+    end
   end
 
   xit "parses typical request" do

data/spec/lib/wash_out/router_spec.rb

@@ -11,12 +11,40 @@ describe WashOut::Router do
     env = {}
     env['REQUEST_METHOD'] = 'GET'
     env['rack.input'] = double 'basic-rack-input', {:string => ''}
-    result = WashOut::Router.new('Api').call env
+    result = WashOut::Router.new('Route::Space::Api').call env
 
-    expect(result[0]).to eq(200)
-    #expect(result[1]['Content-Type']).to eq('text/xml')
+    expect(result[0]).to eq(500)
+    expect(result[1]['Content-Type']).to eq('text/xml; charset=utf-8')
+  end
+
+  def parse_soap_params_from_xml(filename)
+    xml = File.read(File.expand_path("../../../fixtures/#{filename}", __FILE__))
+    env = {'rack.input' => StringIO.new(xml)}
+
+    router = WashOut::Router.new('')
+    controller = double("controller", soap_config: WashOut::SoapConfig.new)
+    allow(router).to receive(:controller).and_return(controller)
+
+    router.parse_soap_parameters(env)[:Envelope][:Body]
+  end
+
+  it "returns refs to arrays correctly" do
+    body = parse_soap_params_from_xml('ref_to_one_array.xml')
+
+    expect(body[:list][:Item]).to eq(["1", "2"])
+  end
+
+  it "returns refs to multiple arrays correctly" do
+    body = parse_soap_params_from_xml('refs_to_arrays.xml')
+
+    expect(body[:first_list][:Item]).to eq(["1", "2"])
+    expect(body[:second_list][:Item]).to eq(["11", "22"])
+  end
+
+  it "returns nested refs to multiple arrays correctly" do
+    body = parse_soap_params_from_xml('nested_refs_to_arrays.xml')
 
-    msg = result[2][0]
-    expect(msg).to eq('OK')
+    expect(body[:parent][:first_list][:Item]).to eq(["1", "2"])
+    expect(body[:parent][:second_list][:Item]).to eq(["11", "22"])
   end
 end

data/spec/lib/wash_out_spec.rb

@@ -12,17 +12,19 @@ describe WashOut do
     )
   end
 
-  def savon(method, message={}, &block)
+  def savon(method, message={}, hashify=true, &block)
     message = {:value => message} unless message.is_a?(Hash)
 
-    savon = Savon::Client.new(:log => false, :wsdl => 'http://app/api/wsdl', &block)
-    savon.call(method, :message => message).to_hash
+    savon  = Savon::Client.new(:log => false, :wsdl => 'http://app/route/api/wsdl', &block)
+    result = savon.call(method, :message => message)
+    result = result.to_hash if hashify
+    result
   end
 
   def savon!(method, message={}, &block)
     message = {:value => message} unless message.is_a?(Hash)
 
-    savon = Savon::Client.new(:log => true, :wsdl => 'http://app/api/wsdl', &block)
+    savon = Savon::Client.new(:log => true, :wsdl => 'http://app/route/api/wsdl', &block)
     savon.call(method, :message => message).to_hash
   end
 
@@ -59,7 +61,7 @@ describe WashOut do
                              :return => { :circle2 => { :y => :integer } }
       end
 
-      HTTPI.get("http://app/api/wsdl").body
+      HTTPI.get("http://app/route/api/wsdl").body
     end
 
     let :xml do
@@ -84,6 +86,13 @@ describe WashOut do
 
       expect(x[:'@min_occurs']).to eq "0"
       expect(x[:'@max_occurs']).to eq "unbounded"
+      expect(x[:'@nillable']).to eq "true"
+    end
+
+    it "adds nillable to all type definitions" do
+      types = xml[:definitions][:message].map { |d| d[:part] }.compact
+      nillable = types.map { |t| t[:"@xsi:nillable"] }
+      expect(nillable.all? { |v| v == "true" }).to be true
     end
   end
 
@@ -109,7 +118,7 @@ describe WashOut do
           </env:Envelope>
         XML
 
-        expect(HTTPI.post("http://app/api/action", request).body).to eq <<-XML
+        expect(HTTPI.post("http://app/route/api/action", request).body).to eq <<-XML
 <?xml version="1.0" encoding="UTF-8"?>
 <soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tns="false">
   <soap:Body>
@@ -145,6 +154,17 @@ describe WashOut do
           to eq "42"
       end
 
+      it "shows date in correct format" do
+        mock_controller do
+          soap_action "answer", :args => {}, :return => {:a => :date}
+          def answer
+            render :soap => {:a => DateTime.new(2000, 1, 1)}
+          end
+        end
+        result = Hash.from_xml savon(:answer, {}, false).http.body
+        expect(result['Envelope']['Body']['answerResponse']['A']).to eq '2000-01-01T00:00:00+00:00'
+      end
+
       it "accept empty parameter" do
         mock_controller do
           soap_action "answer", :args => {:a => :string}, :return => {:a => :string}
@@ -152,8 +172,7 @@ describe WashOut do
             render :soap => {:a => params[:a]}
           end
         end
-        expect(savon(:answer, :a => '')[:answer_response][:a]).
-          to eq({:"@xsi:type"=>"xsd:string"})
+        expect(savon(:answer, :a => '')[:answer_response][:a]).to be_nil
       end
 
       it "accept one parameter" do
@@ -410,10 +429,20 @@ describe WashOut do
             end
           end
 
-          expect(savon(:rocknroll)[:rocknroll_response][:my_value]).
-            to eq({ 
-              :"@xsi:type" => "tns:MyValue"
-            })
+          expect(savon(:rocknroll)[:rocknroll_response][:my_value]).to be_nil
+        end
+
+        it "responds with missing parameters" do
+          mock_controller do
+            soap_action "rocknroll",
+              args: nil,
+              return: {my_value: :integer}
+            def rocknroll
+              render soap: {my_value: nil}
+            end
+          end
+
+          expect(savon(:rocknroll)[:rocknroll_response][:my_value]).to be_nil
         end
 
         it "handles incomplete array response" do
@@ -642,11 +671,25 @@ describe WashOut do
 
       savon(:rocknroll, "ZOMG" => 'yam!')
     end
+  end
 
+  describe "Router" do
+    it "raises when SOAP message without SOAP Envelope arrives" do
+      mock_controller do; end
+      invalid_request = '<a></a>'
+      response_hash = Nori.new.parse(HTTPI.post("http://app/route/api/action", invalid_request).body)
+      expect(response_hash["soap:Envelope"]["soap:Body"]["soap:Fault"]['faultstring']).to eq "Invalid SOAP request"
+    end
+      
+    it "raises when SOAP message without SOAP Body arrives" do
+      mock_controller do; end
+      invalid_request = '<s:Envelope xmlns:s="http://schemas.xmlsoap.org/soap/envelope/"></s:Envelope>'
+      response_hash = Nori.new.parse(HTTPI.post("http://app/route/api/action", invalid_request).body)
+      expect(response_hash["soap:Envelope"]["soap:Body"]["soap:Fault"]['faultstring']).to eq "Invalid SOAP request"
+    end
   end
 
   describe "WS Security" do
-
     it "appends username_token to params" do
       mock_controller(wsse_username: "gorilla", wsse_password: "secret") do
         soap_action "checkToken", :args => :integer, :return => nil, :to => 'check_token'

data/spec/spec_helper.rb

@@ -50,12 +50,18 @@ HTTPI.adapter = :rack
 
 HTTPI::Adapter::Rack.mount 'app', Dummy::Application
 Dummy::Application.routes.draw do
-  wash_out :api
+  namespace :route do
+    scope module: 'space' do
+      wash_out :api
+    end
+  end
 end
 
 def mock_controller(options = {}, &block)
-  Object.send :remove_const, :ApiController if defined?(ApiController)
-  Object.send :const_set, :ApiController, Class.new(ApplicationController) {
+  Object.send :const_set, :Route, Module.new unless defined?(Route)
+  Route.send :const_set, :Space, Module.new unless defined?(Route::Space)
+  Route::Space.send :remove_const, :ApiController if defined?(Route::Space::ApiController)
+  Route::Space.send :const_set, :ApiController, Class.new(ApplicationController) {
     include RSpec::Matchers
     
     soap_service options.reverse_merge({
@@ -66,5 +72,17 @@ def mock_controller(options = {}, &block)
     class_exec &block if block
   }
 
-  ActiveSupport::Dependencies::Reference.instance_variable_get(:'@store').delete('ApiController')
+  ActiveSupport::Dependencies::Reference.instance_variable_get(:'@store').delete('Route::Space::ApiController')
+end
+
+unless defined?(silence_stream) # Rails 5
+  def silence_stream(stream)
+    old_stream = stream.dup
+    stream.reopen(RbConfig::CONFIG['host_os'] =~ /mswin|mingw/ ? 'NUL:' : '/dev/null')
+    stream.sync = true
+    yield
+  ensure
+    stream.reopen(old_stream)
+    old_stream.close
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wash_out
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0.beta.1
 platform: ruby
 authors:
 - Boris Staal
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-04 00:00:00.000000000 Z
+date: 2016-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nori
@@ -48,11 +48,11 @@ files:
 - app/views/wash_out/rpc/error.builder
 - app/views/wash_out/rpc/response.builder
 - app/views/wash_out/rpc/wsdl.builder
-- gemfiles/rails_3.1.3.gemfile
-- gemfiles/rails_3.2.12.gemfile
+- gemfiles/rails_3.2.13.gemfile
 - gemfiles/rails_4.0.0.gemfile
 - gemfiles/rails_4.1.0.gemfile
 - gemfiles/rails_4.2.0.gemfile
+- gemfiles/rails_5.0.0.beta2.gemfile
 - init.rb
 - lib/wash_out.rb
 - lib/wash_out/configurable.rb
@@ -90,6 +90,9 @@ files:
 - spec/dummy/public/favicon.ico
 - spec/dummy/public/stylesheets/.gitkeep
 - spec/dummy/script/rails
+- spec/fixtures/nested_refs_to_arrays.xml
+- spec/fixtures/ref_to_one_array.xml
+- spec/fixtures/refs_to_arrays.xml
 - spec/lib/wash_out/dispatcher_spec.rb
 - spec/lib/wash_out/middleware_spec.rb
 - spec/lib/wash_out/param_spec.rb
@@ -114,12 +117,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Dead simple Rails 3 SOAP server library