wash_out 0.3.4 → 0.3.5

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.3.5
+
+* Very evil thread-safety bug fixed. You are encouraged to never use anything below this version.
+
 ## 0.3.4
 
 * WSDL generation fixed to support complex structures for return values

data/Gemfile

@@ -1,3 +1,5 @@
 source "http://rubygems.org"
 
+gem 'pry'
+
 gemspec

data/Gemfile.lock

@@ -29,6 +29,7 @@ GEM
       bundler
       rake
     builder (3.0.0)
+    coderay (1.0.5)
     diff-lcs (1.1.3)
     erubis (2.7.0)
     gyoku (0.4.4)
@@ -40,10 +41,15 @@ GEM
     journey (1.0.3)
     json (1.6.5)
     json (1.6.5-java)
+    method_source (0.7.1)
     multi_json (1.1.0)
     nokogiri (1.5.0)
     nokogiri (1.5.0-java)
     nori (1.1.0)
+    pry (0.9.8.4)
+      coderay (~> 1.0.5)
+      method_source (~> 0.7.1)
+      slop (>= 2.4.4, < 3)
     rack (1.4.1)
     rack-cache (1.1)
       rack (>= 0.4)
@@ -82,6 +88,7 @@ GEM
       nokogiri (>= 1.4.0)
       nori (~> 1.1)
       wasabi (~> 2.1)
+    slop (2.4.4)
     sprockets (2.1.2)
       hike (~> 1.2)
       rack (~> 1.0)
@@ -98,6 +105,7 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal
+  pry
   rspec-rails
   savon
   tzinfo

data/lib/wash_out/dispatcher.rb

@@ -82,21 +82,27 @@ module WashOut
       result = { 'value' => result } unless result.is_a? Hash
       result = HashWithIndifferentAccess.new(result)
 
-      inject = lambda {|data, source_spec|
-        spec = source_spec.clone
+      inject = lambda {|data, map|
+        result_spec = []
 
-        spec.each_with_index do |param, i|
+        map.each_with_index do |param, i|
+          result_spec[i] = param.flat_copy
+
+          # Inline complex structure
           if param.struct? && !param.multiplied
-            spec[i].map = inject.call(data[param.name], param.map)
+            result_spec[i].map = inject.call(data[param.name], param.map)
+
+          # Inline array of complex structures
           elsif param.struct? && param.multiplied
-            spec[i].map = data[param.name].map{|e| inject.call(e, param.map)}
+            result_spec[i].map = data[param.name].map{|e| inject.call(e, param.map)}
+
           else
-            spec[i] = param.flat_copy
-            spec[i].value = data[param.name]
+            result_spec[i].value = data[param.name]
+
           end
         end
 
-        return spec
+        return result_spec
       }
 
       render :template => 'wash_with_soap/response',

data/lib/wash_out/version.rb

@@ -1,3 +1,3 @@
 module WashOut
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
 end

data/spec/wash_out_spec.rb

@@ -361,4 +361,98 @@ describe WashOut do
     }
   end
 
+  it "should handle return of structs in structs in arrays" do
+    mock_controller do
+      soap_action "rumba",
+        :args => nil,
+        :return => [{:rumbas => {:zombies => :integer}}]
+
+      def rumba
+        render :soap => [{:rumbas => {:zombies => 100000}}, {:rumbas => {:zombies => 2}}]
+      end
+    end
+
+    savon_instance.request(:rumba)[:rumba_response].should == {
+      :value => [
+        {
+          :rumbas => {
+            :zombies => "100000",
+            :"@xsi:type" => "tns:rumbas"
+          },
+          :"@xsi:type" => "tns:value"
+        },
+        {
+          :rumbas => {
+            :zombies => "2",
+            :"@xsi:type" => "tns:rumbas"
+          },
+          :"@xsi:type"=>"tns:value"
+        }
+      ]
+    }
+  end
+
+  it "should handle complex structs/arrays" do
+    mock_controller do
+      soap_action "rumba",
+        :args => nil,
+        :return => {
+          :rumbas => [
+            {
+              :zombies => :string,
+              :puppies => [
+                {:kittens => :integer}
+              ]
+            }
+          ]
+        }
+
+      def rumba
+        render :soap => {
+          :rumbas => [
+            {
+              :zombies => "abc",
+              :puppies => [
+                {:kittens => 1},
+                {:kittens => 5},
+              ]
+            },
+            {
+              :zombies => "def",
+              :puppies => [
+                {:kittens => 4}
+              ]
+            }
+          ]
+        }
+      end
+    end
+
+    savon_instance.request(:rumba)[:rumba_response].should == {
+      :rumbas => [
+        {
+          :zombies => "abc",
+          :puppies => [
+            {
+              :kittens => "1",
+              :"@xsi:type" => "tns:puppies"
+            },
+            {
+              :kittens => "5",
+              :"@xsi:type" => "tns:puppies"
+            }
+          ],
+          :"@xsi:type"=>"tns:rumbas"
+        },
+        {
+          :zombies => "def",
+          :puppies => {
+            :kittens => "4",
+            :"@xsi:type" => "tns:puppies"
+          },
+          :"@xsi:type"=>"tns:rumbas"
+        }
+      ]
+    }
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wash_out
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-26 00:00:00.000000000 Z
+date: 2012-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nori
-  requirement: &70189925216220 !ruby/object:Gem::Requirement
+  requirement: &70310783969100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70189925216220
+  version_requirements: *70310783969100
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70189925215640 !ruby/object:Gem::Requirement
+  requirement: &70310783968680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70189925215640
+  version_requirements: *70310783968680
 - !ruby/object:Gem::Dependency
   name: appraisal
-  requirement: &70189925215120 !ruby/object:Gem::Requirement
+  requirement: &70310783968260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70189925215120
+  version_requirements: *70310783968260
 - !ruby/object:Gem::Dependency
   name: tzinfo
-  requirement: &70189925214560 !ruby/object:Gem::Requirement
+  requirement: &70310783967840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70189925214560
+  version_requirements: *70310783967840
 - !ruby/object:Gem::Dependency
   name: savon
-  requirement: &70189925214060 !ruby/object:Gem::Requirement
+  requirement: &70310783967400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,7 +66,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70189925214060
+  version_requirements: *70310783967400
 description: Dead simple Rails 3 SOAP server library
 email: boris@roundlake.ru
 executables: []