wash_out 0.3.5 → 0.3.6

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.3.6
+
+* Unicorn stream reading bug (#20)
+* .NET minOccurs/maxOccurs basic WSDL compatibility (#22, #23)
+
 ## 0.3.5
 
 * Very evil thread-safety bug fixed. You are encouraged to never use anything below this version.

data/Gemfile.lock

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

data/LICENSE

@@ -0,0 +1,22 @@
+The MIT License
+
+Copyright (c) 2012 Round Lake, inc.,
+                   Peter Zotov <whitequark@whitequark.org>.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/README.md

@@ -132,26 +132,15 @@ 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.
 
-License
+Credits
 -------
 
-    Copyright (C) 2011 by Boris Staal <boris@roundlake.ru>,
-                          Peter Zotov <p.zotov@roundlake.ru>.
-
-    Permission is hereby granted, free of charge, to any person obtaining a copy
-    of this software and associated documentation files (the "Software"), to deal
-    in the Software without restriction, including without limitation the rights
-    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-    copies of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included in
-    all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-    THE SOFTWARE.
+<img src="http://roundlake.ru/assets/logo.png" align="right" />
+
+* Boris Staal ([@_inossidabile](http://twitter.com/#!/_inossidabile))
+* Peter Zotov ([@whitequark](http://twitter.com/#!/whitequark))
+
+LICENSE
+-------
+
+It is free software, and may be redistributed under the terms of MIT license.

data/app/helpers/wash_out_helper.rb

@@ -35,7 +35,7 @@ module WashOutHelper
         xml.tag! "xsd:sequence" do
           param.map.each do |value|
             more << value if value.struct?
-            xml.tag! "xsd:element", wsdl_occurence(value, :name => value.name, :type => value.namespaced_type)
+            xml.tag! "xsd:element", wsdl_occurence(value, false, :name => value.name, :type => value.namespaced_type)
           end
         end
       end
@@ -46,10 +46,10 @@ module WashOutHelper
     end
   end
 
-  def wsdl_occurence(param, extend_with = {})
+  def wsdl_occurence(param, inject, extend_with = {})
     data = !param.multiplied ? {} : {
-      "xsi:minOccurs" => 0,
-      "xsi:maxOccurs" => 'unbounded'
+      "#{'xsi:' if inject}minOccurs" => 0,
+      "#{'xsi:' if inject}maxOccurs" => 'unbounded'
     }
 
     extend_with.merge(data)

data/app/views/wash_with_soap/wsdl.builder

@@ -3,13 +3,13 @@ xml.definitions 'xmlns' => 'http://schemas.xmlsoap.org/wsdl/',
                 'xmlns:tns' => @namespace,
                 'xmlns:soap' => 'http://schemas.xmlsoap.org/wsdl/soap/',
                 'xmlns:xsd' => 'http://www.w3.org/2001/XMLSchema',
-                "xmlns:xsi" => 'http://www.w3.org/2001/XMLSchema-instance',
+                'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance',
                 'xmlns:soap-enc' => 'http://schemas.xmlsoap.org/soap/encoding/',
                 'xmlns:wsdl' => 'http://schemas.xmlsoap.org/wsdl/',
                 'name' => @name,
                 'targetNamespace' => @namespace do
   xml.types do
-    xml.tag! "xsd:schema", :targetNamespace => @namespace do
+    xml.tag! "schema", :targetNamespace => @namespace, :xmlns => 'http://www.w3.org/2001/XMLSchema' do
       @map.each do |operation, formats|
         (formats[:in] + formats[:out]).each do |p|
           wsdl_type xml, p
@@ -51,16 +51,16 @@ xml.definitions 'xmlns' => 'http://schemas.xmlsoap.org/wsdl/',
       xml.tag! "soap:address", :location => url_for(:action => '_action', :only_path => false)
     end
   end
-  
+
   @map.each do |operation, formats|
     xml.message :name => "#{operation}" do
       formats[:in].each do |p|
-        xml.part wsdl_occurence(p, :name => p.name, :type => p.namespaced_type)
+        xml.part wsdl_occurence(p, true, :name => p.name, :type => p.namespaced_type)
       end
     end
     xml.message :name => "#{operation}_response" do
       formats[:out].each do |p|
-        xml.part wsdl_occurence(p, :name => p.name, :type => p.namespaced_type)
+        xml.part wsdl_occurence(p, true, :name => p.name, :type => p.namespaced_type)
       end
     end
   end

data/lib/wash_out/dispatcher.rb

@@ -25,7 +25,7 @@ module WashOut
         Nori.convert_tags_to { |tag| tag.to_sym }
       end
 
-      params = Nori.parse(request.body)
+      params = Nori.parse(request.body.read)
 
       xml_data = params.values_at(:envelope, :Envelope).compact.first
       xml_data = xml_data.values_at(:body, :Body).compact.first

data/lib/wash_out/version.rb

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

data/spec/wash_out_spec.rb

@@ -48,8 +48,8 @@ describe WashOut do
     client.wsdl.soap_actions.should == [:answer, :get_area]
 
     x = xml[:definitions][:types][:schema][:complex_type].find{|x| x[:'@name'] == 'center'}[:sequence][:element].find{|x| x[:'@name'] == 'x'}
-    x[:'@xsi:min_occurs'].should == "0"
-    x[:'@xsi:max_occurs'].should == "unbounded"
+    x[:'@min_occurs'].should == "0"
+    x[:'@max_occurs'].should == "unbounded"
 
     xml[:definitions][:binding][:operation].map{|e| e[:'@name']}.should == ['answer', 'getArea']
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wash_out
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-27 00:00:00.000000000 Z
+date: 2012-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nori
-  requirement: &70310783969100 !ruby/object:Gem::Requirement
+  requirement: &70309445502780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70310783969100
+  version_requirements: *70309445502780
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70310783968680 !ruby/object:Gem::Requirement
+  requirement: &70309445499440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70310783968680
+  version_requirements: *70309445499440
 - !ruby/object:Gem::Dependency
   name: appraisal
-  requirement: &70310783968260 !ruby/object:Gem::Requirement
+  requirement: &70309445483420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70310783968260
+  version_requirements: *70309445483420
 - !ruby/object:Gem::Dependency
   name: tzinfo
-  requirement: &70310783967840 !ruby/object:Gem::Requirement
+  requirement: &70309457795880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70310783967840
+  version_requirements: *70309457795880
 - !ruby/object:Gem::Dependency
   name: savon
-  requirement: &70310783967400 !ruby/object:Gem::Requirement
+  requirement: &70309457794620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,7 +66,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70310783967400
+  version_requirements: *70309457794620
 description: Dead simple Rails 3 SOAP server library
 email: boris@roundlake.ru
 executables: []
@@ -79,6 +79,7 @@ files:
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
+- LICENSE
 - README.md
 - Rakefile
 - app/helpers/wash_out_helper.rb