wash_out 0.3.1 → 0.3.2

data/.travis.yml

@@ -0,0 +1,3 @@
+rvm:
+  - 1.9.3
+  - jruby-19mode

data/CHANGELOG.md

@@ -0,0 +1,19 @@
+# Changelog
+
+## 0.3.2
+
+* WashOut doesn't check existance of parameters anymore you should do it yourself from now
+* Proper handling of blank parameters (#10)
+* Proper handling of complex structures inside arrays (#9)
+* Response performance improved
+
+## 0.3.1
+
+* Support of complex structures inside array
+* Better Nori handling (no more dependency on Savon hijacking)
+
+## 0.3.0
+
+* 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.

data/Gemfile.lock

@@ -1,32 +1,31 @@
 PATH
   remote: .
   specs:
-    wash_out (0.3.0)
+    wash_out (0.3.2)
       nori
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionpack (3.1.2)
-      activemodel (= 3.1.2)
-      activesupport (= 3.1.2)
+    actionpack (3.2.1)
+      activemodel (= 3.2.1)
+      activesupport (= 3.2.1)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      i18n (~> 0.6)
-      rack (~> 1.3.5)
+      journey (~> 1.0.1)
+      rack (~> 1.4.0)
       rack-cache (~> 1.1)
-      rack-mount (~> 0.8.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.1.0)
-    activemodel (3.1.2)
-      activesupport (= 3.1.2)
+      sprockets (~> 2.1.2)
+    activemodel (3.2.1)
+      activesupport (= 3.2.1)
       builder (~> 3.0.0)
+    activesupport (3.2.1)
       i18n (~> 0.6)
-    activesupport (3.1.2)
       multi_json (~> 1.0)
     akami (1.0.0)
       gyoku (>= 0.4.0)
-    appraisal (0.4.0)
+    appraisal (0.4.1)
       bundler
       rake
     builder (3.0.0)
@@ -35,63 +34,62 @@ GEM
     gyoku (0.4.4)
       builder (>= 2.1.2)
     hike (1.2.1)
-    httpi (0.9.5)
+    httpi (0.9.6)
       rack
     i18n (0.6.0)
-    json (1.6.1)
-    json (1.6.1-java)
-    multi_json (1.0.3)
+    journey (1.0.3)
+    json (1.6.5)
+    json (1.6.5-java)
+    multi_json (1.1.0)
     nokogiri (1.5.0)
     nokogiri (1.5.0-java)
-    nori (1.0.2)
-    rack (1.3.5)
+    nori (1.1.0)
+    rack (1.4.1)
     rack-cache (1.1)
       rack (>= 0.4)
-    rack-mount (0.8.3)
-      rack (>= 1.0.0)
     rack-ssl (1.3.2)
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
-    railties (3.1.2)
-      actionpack (= 3.1.2)
-      activesupport (= 3.1.2)
+    railties (3.2.1)
+      actionpack (= 3.2.1)
+      activesupport (= 3.2.1)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (~> 0.14.6)
     rake (0.9.2.2)
-    rdoc (3.11)
+    rdoc (3.12)
       json (~> 1.4)
-    rspec (2.7.0)
-      rspec-core (~> 2.7.0)
-      rspec-expectations (~> 2.7.0)
-      rspec-mocks (~> 2.7.0)
-    rspec-core (2.7.1)
-    rspec-expectations (2.7.0)
+    rspec (2.8.0)
+      rspec-core (~> 2.8.0)
+      rspec-expectations (~> 2.8.0)
+      rspec-mocks (~> 2.8.0)
+    rspec-core (2.8.0)
+    rspec-expectations (2.8.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.7.0)
-    rspec-rails (2.7.0)
-      actionpack (~> 3.0)
-      activesupport (~> 3.0)
-      railties (~> 3.0)
-      rspec (~> 2.7.0)
-    savon (0.9.7)
+    rspec-mocks (2.8.0)
+    rspec-rails (2.8.1)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec (~> 2.8.0)
+    savon (0.9.9)
       akami (~> 1.0)
       builder (>= 2.1.2)
       gyoku (>= 0.4.0)
       httpi (~> 0.9)
       nokogiri (>= 1.4.0)
-      nori (~> 1.0)
-      wasabi (~> 2.0)
-    sprockets (2.1.1)
+      nori (~> 1.1)
+      wasabi (~> 2.1)
+    sprockets (2.1.2)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     thor (0.14.6)
     tilt (1.3.3)
     tzinfo (0.3.31)
-    wasabi (2.0.0)
+    wasabi (2.1.0)
       nokogiri (>= 1.4.0)
 
 PLATFORMS

data/README.md

@@ -12,6 +12,8 @@ Rails >3.0 only.
 
 WashOut should work like a charm on CRuby 1.9.x.
 
+![Travis CI](https://secure.travis-ci.org/roundlake/wash_out.png)
+
 We do support CRuby 1.8.7. However it is not a goal and it is not well supported by our specs. According to
 this fact it maybe sometimes broken from the start on major releases. You are welcome to hold on an old
 version and give us enough issues and pull-requests to make it work.

data/app/helpers/wash_out_helper.rb

@@ -1,24 +1,29 @@
 module WashOutHelper
   def wsdl_data(xml, params)
     params.each do |param|
-      if param.multiplied
-        param.value.each{|v| wsdl_data_value xml, param, v}
+      tag_name = "tns:#{param.name}"
+
+      if !param.struct?
+        if !param.multiplied
+          xml.tag! tag_name, param.value, "xsi:type" => param.namespaced_type
+        else
+          param.value.each do |v|
+            xml.tag! tag_name, v, "xsi:type" => param.namespaced_type
+          end
+        end
       else
-        wsdl_data_value xml, param
-      end
-    end
-  end
-  
-  def wsdl_data_value(xml, param, value=false)
-    value  ||= param.value.to_s
-    tag_name = "tns:#{param.name}"
-    
-    if param.struct?
-      xml.tag! tag_name, "xsi:type" => param.namespaced_type do
-        wsdl_data(xml, param.map)
+        if !param.multiplied
+          xml.tag! tag_name, "xsi:type" => param.namespaced_type do
+            wsdl_data(xml, param.map)
+          end
+        else
+          param.map.each do |p|
+            xml.tag! tag_name, "xsi:type" => param.namespaced_type do
+              wsdl_data(xml, p.map)
+            end
+          end
+        end
       end
-    else
-      xml.tag! tag_name, value, "xsi:type" => param.namespaced_type
     end
   end
 

data/lib/wash_out/dispatcher.rb

@@ -24,19 +24,37 @@ module WashOut
       Nori.convert_tags_to { |tag| tag.snakecase.to_sym }
 
       params = Nori.parse(request.body)
-      xml_data = params[:envelope][:body][soap_action.underscore.to_sym]
+      xml_data = params[:envelope][:body][soap_action.underscore.to_sym] || {}
+
+      strip_empty_nodes = lambda{|hash|
+        hash.each do |key, value|
+          if value.is_a? Hash
+            value = value.delete_if{|key, value| key.to_s[0] == '@'}
+
+            if value.length > 0
+              hash[key] = strip_empty_nodes.call(value)
+            else
+              hash[key] = nil
+            end
+          end
+        end
+
+        hash
+      }
+
+      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
-      (xml_data || {}).map do |opt, value|
-        unless opt.to_s.starts_with? '@'
-          param = action_spec[:in].find { |param| param.name.underscore.to_sym == opt }
-          raise SOAPError, "unknown parameter #{opt}" unless param
 
-          @_params[param.name] = param.load(value)
+      action_spec[:in].each do |param|
+        key = param.name.to_sym
+
+        if xml_data.has_key? key
+          @_params[param.name] = param.load(xml_data, key)
         end
       end
     end
@@ -59,14 +77,21 @@ module WashOut
       result = { 'value' => result } unless result.is_a? Hash
       result = HashWithIndifferentAccess.new(result)
 
-      inject = lambda {|data, spec|
-        spec.each do |param|
-          if param.struct?
-            inject.call(data[param.name], param.map)
+      inject = lambda {|data, source_spec|
+        spec = source_spec.clone
+
+        spec.each_with_index do |param, i|
+          if param.struct? && !param.multiplied
+            spec[i].map = inject.call(data[param.name], param.map)
+          elsif param.struct? && param.multiplied
+            spec[i].map = data[param.name].map{|e| inject.call(e, param.map)}
           else
-            param.value = data[param.name]
+            spec[i] = param.flat_copy
+            spec[i].value = data[param.name]
           end
         end
+
+        return spec
       }
 
       render :template => 'wash_with_soap/response',

data/lib/wash_out/param.rb

@@ -25,18 +25,21 @@ module WashOut
 
     # Converts a generic externally derived Ruby value, such as String or
     # Hash, to a native Ruby object according to the definition of this type.
-    def load(data)
-      check_if_missing(data)
+    def load(data, key)
+      if !data.has_key? key
+        raise WashOut::Dispatcher::SOAPError, "Required SOAP parameter '#{key}' is missing"
+      end
 
+      data = data[key]
       data = Array(data) if @multiplied
 
       if struct?
         if @multiplied
           data.map do |x|
-            map_struct(x) { |param, elem| param.load(elem) }
+            map_struct(x) { |param, data, elem| param.load(data, elem) }
           end
         else
-          map_struct(data) { |param, elem| param.load(elem) }
+          map_struct(data) { |param, data, elem| param.load(data, elem) }
         end
       else
         operation = case type
@@ -106,10 +109,8 @@ module WashOut
       end
     end
 
-    def clone
+    def flat_copy
       copy = self.class.new(@name, @type.to_sym, @multiplied)
-      copy.map = @map.map{|x| x.clone}
-      copy
     end
 
     private
@@ -121,17 +122,10 @@ module WashOut
 
       # RUBY18 Enumerable#each_with_object is better, but 1.9 only.
       @map.map do |param|
-        struct[param.name] = yield param, data[param.name]
+        struct[param.name] = yield param, data, param.name
       end
 
       struct
     end
-
-    # Raise an appropriate exception if a required datum is missing.
-    def check_if_missing(data)
-      if data.nil?
-        raise WashOut::Dispatcher::SOAPError, "Required SOAP parameter '#{@name}' is missing"
-      end
-    end
   end
 end

data/lib/wash_out/version.rb

@@ -1,3 +1,3 @@
 module WashOut
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/spec/wash_out_spec.rb

@@ -52,7 +52,7 @@ describe WashOut do
   it "should allow definition of a simple action" do
     lambda {
       mock_controller do
-        soap_action "answer", :args => nil, :return => :int
+        soap_action "answer", :args => nil, :return => :integer
       end
     }.should_not raise_exception
   end
@@ -69,6 +69,32 @@ describe WashOut do
     client.request(:answer).to_hash[:answer_response][:value].should == "42"
   end
 
+  it "should respond to request with insufficient parameters" do
+    mock_controller do
+      soap_action "answer", :args => {:a => :integer}, :return => :integer
+      def answer
+        render :soap => "42"
+      end
+    end
+
+    client = savon_instance
+    client.request(:answer).to_hash[:answer_response][:value].should == "42"
+  end
+
+  # it "should answer to request with empty parameter" do
+  #   mock_controller do
+  #     soap_action "answer", :args => {:a => :string}, :return => {:a => :string}
+  #     def answer
+  #       render :soap => {:a => params[:a]}
+  #     end
+  #   end
+  # 
+  #   client = savon_instance
+  #   client.request(:answer) do
+  #     soap.body = { :a => '' }
+  #   end.to_hash[:answer_response][:a].should == ''
+  # end
+
   it "should answer to request with one parameter" do
     mock_controller do
       soap_action "checkAnswer", :args => :integer, :return => :boolean, :to => 'check_answer'
@@ -288,4 +314,29 @@ describe WashOut do
     end
   end
 
+  it "should handle return of complex structures inside arrays" do
+    mock_controller do
+      soap_action "rumba",
+        :args   => nil,
+        :return => {
+          :rumbas => [{:zombies => :string, :puppies => :string}]
+        }
+      def rumba
+        render :soap =>
+          {:rumbas => [
+              {:zombies => "suck1", :puppies => "rock1" },
+              {:zombies => "suck2", :puppies => "rock2" }
+            ]
+          }
+      end
+    end
+
+    savon_instance.request(:rumba)[:rumba_response].should == {
+      :rumbas => [
+        {:zombies => "suck1",:puppies => "rock1", :"@xsi:type"=>"tns:rumbas"},
+        {:zombies => "suck2", :puppies => "rock2", :"@xsi:type"=>"tns:rumbas" }
+      ]
+    }
+  end
+
 end

data/wash_out.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.summary     = "Dead simple Rails 3 SOAP server library"
   s.email       = "boris@roundlake.ru"
-  s.homepage    = "http://github.com/roundlake/wash_out"
+  s.homepage    = "http://roundlake.github.com/wash_out/"
   s.description = "Dead simple Rails 3 SOAP server library"
   s.authors     = ['Boris Staal', 'Peter Zotov']
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wash_out
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-02 00:00:00.000000000 Z
+date: 2012-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nori
-  requirement: &70307076083660 !ruby/object:Gem::Requirement
+  requirement: &70132283257380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70307076083660
+  version_requirements: *70132283257380
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70307076083140 !ruby/object:Gem::Requirement
+  requirement: &70132282141100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70307076083140
+  version_requirements: *70132282141100
 - !ruby/object:Gem::Dependency
   name: appraisal
-  requirement: &70307076082660 !ruby/object:Gem::Requirement
+  requirement: &70132282137260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70307076082660
+  version_requirements: *70132282137260
 - !ruby/object:Gem::Dependency
   name: tzinfo
-  requirement: &70307076081960 !ruby/object:Gem::Requirement
+  requirement: &70132282135480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70307076081960
+  version_requirements: *70132282135480
 - !ruby/object:Gem::Dependency
   name: savon
-  requirement: &70307076081100 !ruby/object:Gem::Requirement
+  requirement: &70132286104660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,7 +66,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70307076081100
+  version_requirements: *70132286104660
 description: Dead simple Rails 3 SOAP server library
 email: boris@roundlake.ru
 executables: []
@@ -74,7 +74,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Appraisals
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -122,7 +124,7 @@ files:
 - spec/support/httpi-rack.rb
 - spec/wash_out_spec.rb
 - wash_out.gemspec
-homepage: http://github.com/roundlake/wash_out
+homepage: http://roundlake.github.com/wash_out/
 licenses: []
 post_install_message: 
 rdoc_options: []