wash_out 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c29e3b0667aa9353869a03f7506aa485404607e
-  data.tar.gz: c7bf3f6c9712de139e320bbffbb21cef84b212f0
+  metadata.gz: 513fa69b67fed06699960bc47f74682cb9900e46
+  data.tar.gz: 22cd7eed3781314cdb0cd1027e2255bb1f1f0c66
 SHA512:
-  metadata.gz: 96d597434ea84f2761e07d7b0d41742c89fe010c173377917044fabee2120e7cae4b492ebd9caee86479d054e6ee700caa6449b450cfeddb57e8cbc4c87fd330
-  data.tar.gz: 5b4b784a136b560bd411f779ac95ac11e9ea730c8713cf07508dc93cfd305d67329541a78598bb907ac2037644f1656a979fc4a2a2e00abd9b38e58b0bd302d6
+  metadata.gz: 9d3f66255bf9e1cbf9baac534e10ea48831f41818577750edb1e8352f5ccf9aac1dcb644335e2b3e83e61dee13d30cb0f2bfe973b030a7446e4a00edd43d0db1
+  data.tar.gz: 3ba3e4cba92186115b9a4d5923039b058f60f9d83b725eeba0410136d3d129099f5a0b8a4f5bba7018bf16359294ae4b57388d50d6b12d67827392d88ac9f706

data/.gitignore

@@ -12,3 +12,4 @@ spec/dummy/tmp/
 gemfiles
 coverage
 tags
+Gemfile.lock

data/lib/wash_out/dispatcher.rb

@@ -104,36 +104,40 @@ module WashOut
 
       inject = lambda {|data, map|
         result_spec = []
+        return result_spec if data.nil?
 
         map.each_with_index do |param, i|
           result_spec[i] = param.flat_copy
 
-          # Inline complex structure
-          if param.struct? && !param.multiplied
-            result_spec[i].map = inject.call(data[param.raw_name], param.map)
+          unless data.is_a?(Hash)
+            raise ProgrammerError,
+              "SOAP response used #{data.inspect} (which is #{data.class.name}), " +
+              "in the context where a Hash with key of '#{param.raw_name}' " +
+              "was expected."
+          end
 
-          # Inline array of complex structures
-          elsif param.struct? && param.multiplied
-            if data.nil?
-              data = {} # when no data is given
-            elsif data.is_a?(Array)
-              raise ProgrammerError,
-                "SOAP response used #{data.inspect} (which is an Array), " +
-                "in the context where a Hash with key of '#{param.raw_name}' " +
-                "was expected."
-            end
-            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)}
+          value = data[param.raw_name]
 
-          else
-            val = data[param.raw_name]
-            if param.multiplied and val and not val.is_a?(Array)
+          unless value.nil?
+            if param.multiplied && !value.is_a?(Array)
               raise ProgrammerError,
-                "SOAP response tried to use '#{val.inspect}' " +
-                "(which is of type #{val.class}), as the value for " +
+                "SOAP response tried to use '#{value.inspect}' " +
+                "(which is of type #{value.class.name}), as the value for " +
                 "'#{param.raw_name}' (which expects an Array)."
             end
-            result_spec[i].value = val
+
+            # Inline complex structure              {:foo => {bar: ...}}
+            if param.struct? && !param.multiplied
+              result_spec[i].map = inject.call(value, param.map)
+
+            # Inline array of complex structures    {:foo => [{bar: ...}]}
+            elsif param.struct? && param.multiplied
+              result_spec[i].map = value.map{|e| inject.call(e, param.map)}
+
+            # Inline scalar                         {:foo => :string}
+            else
+              result_spec[i].value = value
+            end
           end
         end
 

data/lib/wash_out/version.rb

@@ -1,3 +1,3 @@
 module WashOut
-  VERSION = "0.8.1"
+  VERSION = "0.8.2"
 end

data/spec/lib/wash_out_spec.rb

@@ -354,7 +354,7 @@ describe WashOut do
         it "respond with complext definition" do
           mock_controller do
             soap_action "rocknroll",
-                        :args => nil, :return => { :my_value => [{ :value => :integer}] }
+                        :args => nil, :return => { :my_value => [{ :value => :integer }] }
             def rocknroll
               render :soap => {}
             end
@@ -366,7 +366,7 @@ describe WashOut do
         it "respond with nested simple definition" do
           mock_controller do
             soap_action "rocknroll",
-                        :args => nil, :return => { :my_value => { :my_array => [{ :value => :integer}] } }
+                        :args => nil, :return => { :my_value => { :my_array => [{ :value => :integer }] } }
             def rocknroll
               render :soap => {}
             end
@@ -375,6 +375,18 @@ describe WashOut do
           savon(:rocknroll)[:rocknroll_response][:my_value].
             should == { :"@xsi:type" => "tns:MyValue" }
         end
+
+        it "handles incomplete array response" do
+          mock_controller do
+            soap_action "rocknroll",
+                        :args => nil, :return => { :my_value => [{ :value => :string }] }
+            def rocknroll
+              render :soap => { :my_value => [nil] }
+            end
+          end
+
+          expect{savon(:rocknroll)}.not_to raise_error
+        end
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wash_out
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Boris Staal
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-06 00:00:00.000000000 Z
+date: 2013-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nori
@@ -37,7 +37,6 @@ files:
 - Appraisals
 - CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - Guardfile
 - LICENSE
 - README.md

data/Gemfile.lock

@@ -1,109 +0,0 @@
-GIT
-  remote: git://github.com/savonrb/httpi.git
-  revision: 6ca1151f691a6ae8599838b404605aac62ad23c9
-  specs:
-    httpi (2.1.0)
-      rack
-      rubyntlm (~> 0.3.2)
-
-PATH
-  remote: .
-  specs:
-    wash_out (0.8.1)
-      nori (>= 2.0.0)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    akami (1.2.0)
-      gyoku (>= 0.4.0)
-      nokogiri (>= 1.4.0)
-    appraisal (0.5.2)
-      bundler
-      rake
-    builder (3.2.2)
-    coderay (1.0.9)
-    colored (1.2)
-    diff-lcs (1.1.3)
-    ffi (1.9.0)
-    formatador (0.2.4)
-    guard (1.8.2)
-      formatador (>= 0.2.4)
-      listen (>= 1.0.0)
-      lumberjack (>= 1.0.2)
-      pry (>= 0.9.10)
-      thor (>= 0.14.6)
-    guard-rspec (1.2.1)
-      guard (>= 1.1)
-    gyoku (1.1.0)
-      builder (>= 2.1.2)
-    listen (1.2.2)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
-      rb-kqueue (>= 0.2)
-    lumberjack (1.0.4)
-    method_source (0.8.2)
-    multi_json (1.7.8)
-    nokogiri (1.5.10)
-    nori (2.3.0)
-    pry (0.9.12.2)
-      coderay (~> 1.0.5)
-      method_source (~> 0.8)
-      slop (~> 3.4)
-    rack (1.5.2)
-    rake (10.1.0)
-    rb-fsevent (0.9.3)
-    rb-inotify (0.9.0)
-      ffi (>= 0.5.0)
-    rb-kqueue (0.2.0)
-      ffi (>= 0.5.0)
-    rspec (2.1.0)
-      rspec-core (~> 2.1.0)
-      rspec-expectations (~> 2.1.0)
-      rspec-mocks (~> 2.1.0)
-    rspec-core (2.1.0)
-    rspec-expectations (2.1.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.1.0)
-    rspec-rails (2.1.0)
-      rspec (~> 2.1.0)
-    rubyntlm (0.3.3)
-    savon (2.3.0)
-      akami (~> 1.2.0)
-      builder (>= 2.1.2)
-      gyoku (~> 1.1.0)
-      httpi (~> 2.1.0)
-      nokogiri (>= 1.4.0, < 1.6)
-      nori (~> 2.3.0)
-      wasabi (~> 3.2.0)
-    simplecov (0.7.1)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.7.1)
-    simplecov-html (0.7.1)
-    simplecov-summary (0.0.4)
-      colored
-      simplecov
-    slop (3.4.6)
-    thor (0.18.1)
-    tzinfo (1.0.1)
-    wasabi (3.2.0)
-      httpi (~> 2.0)
-      nokogiri (>= 1.4.0, < 1.6)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  appraisal
-  guard
-  guard-rspec
-  httpi!
-  pry
-  rb-fsevent
-  rspec-rails
-  savon (>= 2.0.0)
-  simplecov
-  simplecov-summary
-  tzinfo
-  wasabi
-  wash_out!