wash_out 0.2.3 → 0.2.4

data/README.md

@@ -59,7 +59,7 @@ class ApiController < ApplicationController
   # is just like a normal controller with a special routing.
   before_filter :dump_parameters
   def dump_parameters
-    Rails.logger.log(params.inspect)
+    Rails.logger.debug params.inspect
   end
 end
 ```

data/app/helpers/wash_out_helper.rb

@@ -13,13 +13,11 @@ module WashOutHelper
     more = []
 
     if param.struct?
-      return if param.value.blank?
-
-      xml.complexType :name => param.name do
-        xml.sequence do
-          param.map.each do |key, value|
+      xml.tag! "xsd:complexType", :name => param.name do
+        xml.tag! "xsd:sequence" do
+          param.map.each do |value|
             more << value if value.struct?
-            xml.element wsdl_occurence(value, :name => key, :type => value.namespaced_type)
+            xml.tag! "xsd:element", wsdl_occurence(value, :name => value.name, :type => value.namespaced_type)
           end
         end
       end

data/app/views/wash_with_soap/wsdl.builder

@@ -2,16 +2,15 @@ xml.instruct!
 xml.definitions 'xmlns:xsd' => 'http://www.w3.org/2001/XMLSchema',
                 'xmlns:soap' => 'http://schemas.xmlsoap.org/wsdl/soap/',
                 'xmlns:soapenc' => 'http://schemas.xmlsoap.org/soap/encoding/',
-                'xmlns:wsdl' => 'http://schemas.xmlsoap.org/wsdl/',
                 'xmlns:typens' => @namespace,
                 'targetNamespace' => @namespace,
                 'xmlns' => 'http://schemas.xmlsoap.org/wsdl/' do
   xml.types do
-    xml.tag! "xsd:schema", :xmlns => 'http://www.w3.org/2001/XMLSchema', :targetNamespace => @namespace
-
-    @map.each do |operation, formats|
-      formats[:in].each do |p|
-        wsdl_type xml, p
+    xml.tag! "xsd:schema", :targetNamespace => @namespace do
+      @map.each do |operation, formats|
+        formats[:in].each do |p|
+          wsdl_type xml, p
+        end
       end
     end
   end
@@ -62,4 +61,4 @@ xml.definitions 'xmlns:xsd' => 'http://www.w3.org/2001/XMLSchema',
       xml.tag! "soap:address", :location => url_for(:action => '_action', :only_path => false)
     end
   end
-end
+end

data/gemfiles/rails-3.0.11.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
-  remote: /home/whitequark/wash_out
+  remote: /Users/lovchy/Sites/wash_out
   specs:
-    wash_out (0.2.1)
+    wash_out (0.2.3)
       nori
 
 GEM

data/gemfiles/rails-3.1.3.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
-  remote: /home/whitequark/wash_out
+  remote: /Users/lovchy/Sites/wash_out
   specs:
-    wash_out (0.2.1)
+    wash_out (0.2.3)
       nori
 
 GEM

data/lib/wash_out/dispatcher.rb

@@ -14,15 +14,21 @@ module WashOut
       soap_action = request.env['wash_out.soap_action']
       action_spec = self.class.soap_actions[soap_action]
 
+      strip = Nori.strip_namespaces?
+
+      Nori.strip_namespaces = true
       params = Nori.parse(request.body)
       xml_data = params[:envelope][:body][soap_action.underscore.to_sym]
+      Nori.strip_namespaces = strip
 
       @_params = HashWithIndifferentAccess.new
       (xml_data || {}).map do |opt, value|
-        param = action_spec[:in].find { |param| param.name.underscore.to_sym == opt }
-        raise SOAPError, "unknown parameter #{opt}" unless param
+        unless opt[0] == '@'
+          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)
+          @_params[param.name] = param.load(value)
+        end
       end
     end
 

data/lib/wash_out/version.rb

@@ -1,3 +1,3 @@
 module WashOut
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

data/lib/wash_out.rb

@@ -17,4 +17,4 @@ end
 Mime::Type.register "application/soap+xml", :soap
 ActionController::Renderers.add :soap do |what, options|
   _render_soap(what, options)
-end
+end

data/spec/wash_out_spec.rb

@@ -15,6 +15,36 @@ describe WashOut do
     }.should_not raise_exception
   end
 
+  it "should generate WSDL" do
+    mock_controller do
+      soap_action "answer", :args => [], :return => :int
+      def answer
+        render :soap => "42"
+      end
+
+      soap_action "getArea", :args   => { :circle => { :center => { :x => :integer,
+                                                                    :y => :integer },
+                                                       :radius => :double } },
+                             :return => { :area => :double,
+                                          :distance_from_o => :double },
+                             :to     => :get_area
+      def get_area
+        circle = params[:circle]
+        render :soap => { :area            => Math::PI * circle[:radius] ** 2,
+                          :distance_from_o => Math.sqrt(circle[:center][:x] ** 2 + circle[:center][:y] ** 2) }
+      end
+    end
+
+    client = savon_instance
+    xml    = Nori.parse client.wsdl.xml
+
+    # Savon underscores method names so we 
+    # get back just what we have at controller
+    client.wsdl.soap_actions.should == [:answer, :get_area]
+
+    xml[:definitions][:binding][:operation].map{|e| e[:'@name']}.should == ['answer', 'getArea']
+  end
+
   it "should allow definition of a simple action" do
     lambda {
       mock_controller do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wash_out
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-20 00:00:00.000000000 Z
+date: 2012-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nori
-  requirement: &73419490 !ruby/object:Gem::Requirement
+  requirement: &70257566070660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *73419490
+  version_requirements: *70257566070660
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &73418980 !ruby/object:Gem::Requirement
+  requirement: &70257566069340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *73418980
+  version_requirements: *70257566069340
 - !ruby/object:Gem::Dependency
   name: appraisal
-  requirement: &73418630 !ruby/object:Gem::Requirement
+  requirement: &70257566068200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *73418630
+  version_requirements: *70257566068200
 - !ruby/object:Gem::Dependency
   name: tzinfo
-  requirement: &73417730 !ruby/object:Gem::Requirement
+  requirement: &70257566067180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *73417730
+  version_requirements: *70257566067180
 - !ruby/object:Gem::Dependency
   name: savon
-  requirement: &73415050 !ruby/object:Gem::Requirement
+  requirement: &70257566085000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,7 +66,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *73415050
+  version_requirements: *70257566085000
 description: Dead simple Rails 3 SOAP server library
 email: boris@roundlake.ru
 executables: []
@@ -134,18 +134,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -441958353
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -441958353
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10