wash_out 0.9.2 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9149b2f9a1a04ad8d6ba859ef68f2dbf9db6d585
-  data.tar.gz: 55936871f904cf8d45517312b4479a39a5a5e5d5
+  metadata.gz: 82173ea05524c819f835867ecc6c49b2e5264be4
+  data.tar.gz: c539a9c5a8793bb884c575f03624aec4f78dad09
 SHA512:
-  metadata.gz: 5e2798c550e16322bb72de0dfa08c0e3a18ec3d292b481fc905d36f72d4b51a60bd889a583b723fc54081a484520c260a07e8b28dab1bb9babfa10f115e76e4b
-  data.tar.gz: 08821de12b76c9fc9f4c79ddc381279ebddfa7c42d6a197e9a7b7528f94044b46927edffab4bf9bb7dfcb090e4678effe80ef1e61cfd4cdee6c339dd0ed64090
+  metadata.gz: f95800e511ef556fcd9be44eb3f15ce7c8a95ed9f90cf9bc35d2870f89c4cd7357059d914bc2f0c81eef0119adf092c6fad0cb803e4bc097c03cdcc25a01d8ab
+  data.tar.gz: e0aee07a1f29c56a175b4bbb764fffb086e515084783a305db61697efe287080aee785ed6cf165b58f285a615df3c93cd13dfafedc865c724fc82a14e4e3d13c

data/.gitignore

@@ -11,7 +11,7 @@ pkg/
 spec/dummy/db/*.sqlite3
 spec/dummy/log/*.log
 spec/dummy/tmp/
-gemfiles
+gemfiles/*.lock
 coverage
 tags
 Gemfile.lock

data/.travis.yml

@@ -1,7 +1,38 @@
-before_install:
-  - gem install bundler
+script: bundle exec rspec
+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.gemfile
 rvm:
   - 1.9.3
-  - jruby-19mode
   - 2.0.0
-  - 2.1.0
+  - 2.1.8
+  - 2.2.4
+  - 2.3.0
+  - jruby
+matrix:
+  exclude:
+    - rvm: 2.2.4
+      gemfile: gemfiles/rails_3.2.13.gemfile
+    - rvm: 2.3.0
+      gemfile: gemfiles/rails_3.2.13.gemfile
+    - rvm: 1.9.3
+      gemfile: gemfiles/rails_4.0.0.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.gemfile
+    - rvm: 2.0.0
+      gemfile: gemfiles/rails_5.0.0.gemfile
+    - rvm: 2.1.8
+      gemfile: gemfiles/rails_5.0.0.gemfile
+    - rvm: 2.2.4
+      gemfile: gemfiles/rails_5.0.0.gemfile
+    - rvm: jruby
+      gemfile: gemfiles/rails_5.0.0.gemfile
+before_install:
+  - gem update bundler

data/Appraisals

@@ -1,23 +1,19 @@
-appraise "rails-3.2.8" do
-  gem "rails", "3.2.8"
-end
-
-appraise "rails-3.1.3" do
-  gem "rails", "3.1.3"
-end
-
-appraise "rails-3.2.12" do
-  gem "rails", "3.2.12"
-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" do
+  gem "rails", "5.0.0"
 end

data/Gemfile

@@ -14,4 +14,4 @@ gem 'appraisal'
 gem 'tzinfo'
 gem 'pry'
 gem 'simplecov'
-gem 'simplecov-summary'
+gem 'simplecov-summary'

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 4.0 and higher is tested. Code is known to work with earlier versions but we don't bother testing outdated versions anymore - give it a try if you are THAT unlucky.
 
 ## Installation
 
@@ -75,15 +71,97 @@ 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;
+  # e.g. for a request to the 'AddCircle' action:
+  #   <soapenv:Envelope>
+  #     <soapenv:Body>
+  #       <AddCircle>
+  #         <Circle radius="5.0">
+  #           <Center x="10" y="12" />
+  #         </Circle>
+  #       </AddCircle>
+  #     </soapenv:Body>
+  #   </soapenv:Envelope>
+  soap_action "AddCircle",
+              :args   => { :circle => { :center => { :@x => :integer,
+                                                     :@y => :integer },
+                                        :@radius => :double } },
+              :return => nil, # [] for wash_out below 0.3.0
+              :to     => :add_circle
+  def add_circle
+    circle = params[:circle]
+    Circle.new(circle[:center][:x], circle[:center][:y], circle[:radius])
+
+    render :soap => nil
+  end
+
+  # With a customised input tag name, in case params are wrapped;
+  # e.g. for a request to the 'IntegersToBoolean' action:
+  #   <soapenv:Envelope>
+  #     <soapenv:Body>
+  #       <MyRequest>  <!-- not <IntegersToBoolean> -->
+  #         <Data>...</Data>
+  #       </MyRequest>
+  #     </soapenv:Body>
+  #   </soapenv:Envelope>
+  soap_action "integers_to_boolean",
+              :args => { :my_request => { :data => [:integer] } },
+              :as => 'MyRequest',
+              :return => [:boolean]
+
   # You can use all Rails features like filtering, too. A SOAP controller
   # is just like a normal controller with a special routing.
   before_filter :dump_parameters
   def dump_parameters
     Rails.logger.debug params.inspect
   end
+  
+  
+  # Rendering SOAP headers
+  soap_action "integer_to_header_string",
+              :args   => :integer,
+              :return => :string,
+              :header_return => :string
+  def integer_to_header_string
+    render :soap => params[:value].to_s, :header => (params[:value]+1).to_s
+  end
+  
+  # Reading SOAP Headers
+  # This is different than normal SOAP params, because we don't specify the incoming format of the header,
+  # but we can still access it through `soap_request.headers`.  Note that the values are all strings or hashes.
+  soap_action "AddCircleWithHeaderRadius",
+              :args   => { :circle => { :center => { :x => :integer,
+                                                     :y => :integer } } },
+              :return => nil, # [] for wash_out below 0.3.0
+              :to     => :add_circle
+  # e.g. for a request to the 'AddCircleWithHeaderRadius' action:
+  #   <soapenv:Envelope>
+  #     <soap:Header>
+  #       <radius>12345</radius>
+  #     </soap:Header>
+  #     <soapenv:Body>
+  #       <AddCircle>
+  #         <Circle radius="5.0">
+  #           <Center x="10" y="12" />
+  #         </Circle>
+  #       </AddCircle>
+  #     </soapenv:Body>
+  #   </soapenv:Envelope>
+  def add_circle_with_header_radius
+    circle = params[:circle]
+    radius = soap_request.headers[:radius]
+    raise SOAPError, "radius must be specified in the SOAP header" if radius.blank?
+    radius = radius.to_f
+    raise SOAPError, "radius is too small" if radius < 3.0
+
+    Circle.new(circle[:center][:x], circle[:center][:y], radius)
+
+    render :soap => nil
+  end
+  
 end
 ```
 
@@ -122,7 +200,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/Rakefile

@@ -3,12 +3,22 @@ require 'bundler/gem_tasks'
 require 'appraisal'
 require 'rspec/core/rake_task'
 
-RSpec::Core::RakeTask.new(:spec)
+RSpec::Core::RakeTask.new
 
-desc "Default: run the unit tests."
-task :default => [:all]
+task :console do
+  require "action_controller/railtie"
+  require "rails/test_unit/railtie"
+  Bundler.require
+  binding.pry
+end
+
+
+desc 'Default: run the unit tests.'
+task default: [:all]
 
 desc 'Test the plugin under all supported Rails versions.'
-task :all => ["appraisal:install"] do |t|
-  exec('rake appraisal spec')
+task :all do |_t|
+    # this is needed for minitest because it does not support "--pattern" option as Rspec Does
+    ENV['SPEC'] = '--name=spec/**{,/*/**}/*_spec.rb'
+    exec('bundle exec appraisal install && bundle exec rake appraisal spec')
 end

data/app/helpers/wash_out_helper.rb

@@ -3,37 +3,57 @@ 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
   end
 
+  def wsdl_data_attrs(param)
+    param.map.reduce({}) do |memo, p|
+      if p.respond_to?(:attribute?) && p.attribute?
+        memo.merge p.attr_name => p.value
+      else
+        memo
+      end
+    end
+  end
+
   def wsdl_data(xml, params)
     params.each do |param|
+      next if param.attribute?
+
       tag_name = param.name
       param_options = wsdl_data_options(param)
+      param_options.merge! wsdl_data_attrs(param)
 
-      if !param.struct?
-        if !param.multiplied
-          xml.tag! tag_name, param.value, param_options
+      if param.struct?
+        if param.multiplied
+          param.map.each do |p|
+            attrs = wsdl_data_attrs p
+            if p.is_a?(Array) || p.map.size > attrs.size
+              blk = proc { wsdl_data(xml, p.map) }
+            end
+            attrs.reject! { |_, v| v.nil? }
+            xml.tag! tag_name, param_options.merge(attrs), &blk
+          end
         else
-          param.value = [] unless param.value.is_a?(Array)
-          param.value.each do |v|
-            xml.tag! tag_name, v, param_options
+          xml.tag! tag_name, param_options do
+            wsdl_data(xml, param.map)
           end
         end
       else
-        if !param.multiplied
-          xml.tag! tag_name,  param_options do
-            wsdl_data(xml, param.map)
+        if param.multiplied
+          param.value = [] unless param.value.is_a?(Array)
+          param.value.each do |v|
+            xml.tag! tag_name, v, param_options
           end
         else
-          param.map.each do |p|
-            xml.tag! tag_name, param_options do
-              wsdl_data(xml, p.map)
-            end
-          end
+          xml.tag! tag_name, param.value, param_options
         end
       end
     end
@@ -45,12 +65,27 @@ module WashOutHelper
     if param.struct?
       if !defined.include?(param.basic_type)
         xml.tag! "xsd:complexType", :name => param.basic_type do
-          xml.tag! "xsd:sequence" do
-            param.map.each do |value|
-              more << value if value.struct?
-              xml.tag! "xsd:element", wsdl_occurence(value, false, :name => value.name, :type => value.namespaced_type)
+          attrs, elems = [], []
+          param.map.each do |value|
+            more << value if value.struct?
+            if value.attribute?
+              attrs << value
+            else
+              elems << value
             end
           end
+
+          if elems.any?
+            xml.tag! "xsd:sequence" do
+              elems.each do |value|
+                xml.tag! "xsd:element", wsdl_occurence(value, false, :name => value.name, :type => value.namespaced_type)
+              end
+            end
+          end
+
+          attrs.each do |value|
+            xml.tag! "xsd:attribute", wsdl_occurence(value, false, :name => value.attr_name, :type => value.namespaced_type)
+          end
         end
 
         defined << param.basic_type
@@ -65,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_with_soap → wash_out}/document/response.builder

@@ -2,6 +2,13 @@ xml.instruct!
 xml.tag! "soap:Envelope", "xmlns:soap" => 'http://schemas.xmlsoap.org/soap/envelope/',
                           "xmlns:xsd" => 'http://www.w3.org/2001/XMLSchema',
                           "xmlns:tns" => @namespace do
+  if !header.nil?
+    xml.tag! "soap:Header" do
+      xml.tag! "tns:#{@action_spec[:response_tag]}" do
+        wsdl_data xml, header
+      end
+    end
+  end
   xml.tag! "soap:Body" do
     xml.tag! "tns:#{@action_spec[:response_tag]}" do
       wsdl_data xml, result

data/app/views/{wash_with_soap → wash_out}/document/wsdl.builder

@@ -19,6 +19,19 @@ xml.definitions 'xmlns' => 'http://schemas.xmlsoap.org/wsdl/',
     end
   end
 
+  @map.each do |operation, formats|
+    xml.message :name => "#{operation}" do
+      formats[:in].each do |p|
+        xml.part wsdl_occurence(p, false, :name => p.name, :type => p.namespaced_type)
+      end
+    end
+    xml.message :name => formats[:response_tag] do
+      formats[:out].each do |p|
+        xml.part wsdl_occurence(p, false, :name => p.name, :type => p.namespaced_type)
+      end
+    end
+  end
+
   xml.portType :name => "#{@name}_port" do
     @map.each do |operation, formats|
       xml.operation :name => operation do
@@ -49,20 +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")
-    end
-  end
-
-  @map.each do |operation, formats|
-    xml.message :name => "#{operation}" do
-      formats[:in].each do |p|
-        xml.part wsdl_occurence(p, false, :name => p.name, :type => p.namespaced_type)
-      end
-    end
-    xml.message :name => formats[:response_tag] do
-      formats[:out].each do |p|
-        xml.part wsdl_occurence(p, false, :name => p.name, :type => p.namespaced_type)
-      end
+      xml.tag! "soap:address", :location => WashOut::Router.url(request, @name)
     end
   end
 end

data/app/views/{wash_with_soap → wash_out}/rpc/response.builder

@@ -3,9 +3,16 @@ xml.tag! "soap:Envelope", "xmlns:soap" => 'http://schemas.xmlsoap.org/soap/envel
                           "xmlns:xsd" => 'http://www.w3.org/2001/XMLSchema',
                           "xmlns:xsi" => 'http://www.w3.org/2001/XMLSchema-instance',
                           "xmlns:tns" => @namespace do
+  if !header.nil?
+    xml.tag! "soap:Header" do
+      xml.tag! "tns:#{@action_spec[:response_tag]}" do
+        wsdl_data xml, header
+      end
+    end
+  end
   xml.tag! "soap:Body" do
     xml.tag! "tns:#{@action_spec[:response_tag]}" do
       wsdl_data xml, result
     end
   end
-end
+end

data/app/views/{wash_with_soap → wash_out}/rpc/wsdl.builder

@@ -19,6 +19,19 @@ xml.definitions 'xmlns' => 'http://schemas.xmlsoap.org/wsdl/',
     end
   end
 
+  @map.each do |operation, formats|
+    xml.message :name => "#{operation}" do
+      formats[:in].each do |p|
+        xml.part wsdl_occurence(p, true, :name => p.name, :type => p.namespaced_type)
+      end
+    end
+    xml.message :name => formats[:response_tag] do
+      formats[:out].each do |p|
+        xml.part wsdl_occurence(p, true, :name => p.name, :type => p.namespaced_type)
+      end
+    end
+  end
+
   xml.portType :name => "#{@name}_port" do
     @map.each do |operation, formats|
       xml.operation :name => operation do
@@ -49,20 +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")
-    end
-  end
-
-  @map.each do |operation, formats|
-    xml.message :name => "#{operation}" do
-      formats[:in].each do |p|
-        xml.part wsdl_occurence(p, true, :name => p.name, :type => p.namespaced_type)
-      end
-    end
-    xml.message :name => formats[:response_tag] do
-      formats[:out].each do |p|
-        xml.part wsdl_occurence(p, true, :name => p.name, :type => p.namespaced_type)
-      end
+      xml.tag! "soap:address", :location => WashOut::Router.url(request, @name)
     end
   end
-end
+end

data/gemfiles/rails_3.2.13.gemfile

@@ -0,0 +1,21 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "wasabi"
+gem "savon", ">= 2.0.0"
+gem "httpi"
+gem "rspec-rails"
+gem "guard"
+gem "guard-rspec"
+gem "rb-fsevent"
+gem "appraisal"
+gem "tzinfo"
+gem "pry"
+gem "simplecov"
+gem "simplecov-summary"
+gem "rails", "3.2.13"
+gem "test-unit"
+gem "listen", "< 3.1.0"
+
+gemspec :path => "../"

data/gemfiles/rails_4.0.0.gemfile

@@ -0,0 +1,20 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "wasabi"
+gem "savon", ">= 2.0.0"
+gem "httpi"
+gem "rspec-rails"
+gem "guard"
+gem "guard-rspec"
+gem "rb-fsevent"
+gem "appraisal"
+gem "tzinfo"
+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

@@ -0,0 +1,20 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "wasabi"
+gem "savon", ">= 2.0.0"
+gem "httpi"
+gem "rspec-rails"
+gem "guard"
+gem "guard-rspec"
+gem "rb-fsevent"
+gem "appraisal"
+gem "tzinfo"
+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

@@ -0,0 +1,20 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "wasabi"
+gem "savon", ">= 2.0.0"
+gem "httpi"
+gem "rspec-rails"
+gem "guard"
+gem "guard-rspec"
+gem "rb-fsevent"
+gem "appraisal"
+gem "tzinfo"
+gem "pry"
+gem "simplecov"
+gem "simplecov-summary"
+gem "rails", "4.2.0"
+gem "listen", "< 3.1.0"
+
+gemspec :path => "../"

data/gemfiles/rails_5.0.0.beta2.gemfile

@@ -0,0 +1,19 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "wasabi"
+gem "savon", ">= 2.0.0"
+gem "httpi"
+gem "rspec-rails"
+gem "guard"
+gem "guard-rspec"
+gem "rb-fsevent"
+gem "appraisal"
+gem "tzinfo"
+gem "pry"
+gem "simplecov"
+gem "simplecov-summary"
+gem "rails", "5.0.0.beta2"
+
+gemspec :path => "../"

data/gemfiles/rails_5.0.0.gemfile

@@ -0,0 +1,19 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "wasabi"
+gem "savon", ">= 2.0.0"
+gem "httpi"
+gem "rspec-rails"
+gem "guard"
+gem "guard-rspec"
+gem "rb-fsevent"
+gem "appraisal"
+gem "tzinfo"
+gem "pry"
+gem "simplecov"
+gem "simplecov-summary"
+gem "rails", "5.0.0"
+
+gemspec :path => "../"