wash_out 0.3.3 → 0.3.4

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.3.4
+
+* WSDL generation fixed to support complex structures for return values
+* Configuration moved to OrderedOptions with proper Engine binding
+* `snakecase` configuration directive added: if set to false, wash_out won't modify params keys
+
 ## 0.3.3
 
 * Tiny fixes in wash_out behavior with inline arrays (#11, #12)
@@ -21,4 +27,4 @@
 
 * 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.
+* Arrays (minOccurs/maxOccurs) are now supported with `:foo => [:integer]` syntax.

data/Gemfile.lock

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

data/README.md

@@ -122,10 +122,15 @@ result.to_hash # => {:value=>"123abc"}
 
 Take a look at [WashOut sample application](https://github.com/roundlake/wash_out-sample).
 
-Namespace
+Configuration
 ---------
 
-Use `config.action_view.washout_namespace = 'urn:test'` inside your environment configuration to modify default `urn:WashOut` namespace.
+Use `config.wash_out...` inside your environment configuration to setup WashOut.
+
+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
 -------

data/app/views/wash_with_soap/wsdl.builder

@@ -11,7 +11,7 @@ xml.definitions 'xmlns' => 'http://schemas.xmlsoap.org/wsdl/',
   xml.types do
     xml.tag! "xsd:schema", :targetNamespace => @namespace do
       @map.each do |operation, formats|
-        formats[:in].each do |p|
+        (formats[:in] + formats[:out]).each do |p|
           wsdl_type xml, p
         end
       end

data/lib/wash_out/dispatcher.rb

@@ -9,11 +9,6 @@ module WashOut
     # response.
     class SOAPError < Exception; end
 
-    def namespace
-      namespace   = ActionView::Base.washout_namespace if defined?(ActionView::Base)
-      namespace ||= 'urn:WashOut'
-    end
-
     # This filter parses the SOAP request and puts it into +params+ array.
     def _parse_soap_parameters
       soap_action = request.env['wash_out.soap_action']
@@ -23,10 +18,18 @@ module WashOut
       strip   = Nori.strip_namespaces?
       convert = Nori.convert_tags?
       Nori.strip_namespaces = true
-      Nori.convert_tags_to { |tag| tag.snakecase.to_sym }
+
+      if WashOut::Engine.snakecase
+        Nori.convert_tags_to { |tag| tag.snakecase.to_sym }
+      else
+        Nori.convert_tags_to { |tag| tag.to_sym }
+      end
 
       params = Nori.parse(request.body)
-      xml_data = params[:envelope][:body][soap_action.underscore.to_sym] || {}
+
+      xml_data = params.values_at(:envelope, :Envelope).compact.first
+      xml_data = xml_data.values_at(:body, :Body).compact.first
+      xml_data = xml_data.values_at(soap_action.underscore.to_sym, soap_action.to_sym).compact.first || {}
 
       strip_empty_nodes = lambda{|hash|
         hash.each do |key, value|
@@ -64,7 +67,7 @@ module WashOut
     # This action generates the WSDL for defined SOAP methods.
     def _generate_wsdl
       @map       = self.class.soap_actions
-      @namespace = namespace
+      @namespace = WashOut::Engine.namespace
       @name      = controller_path.gsub('/', '_')
 
       render :template => 'wash_with_soap/wsdl'
@@ -72,9 +75,9 @@ module WashOut
 
     # Render a SOAP response.
     def _render_soap(result, options)
-      @namespace  = namespace
+      @namespace  = WashOut::Engine.namespace
       @operation  = soap_action = request.env['wash_out.soap_action']
-      action_spec = self.class.soap_actions[soap_action][:out].clone
+      action_spec = self.class.soap_actions[soap_action][:out]
 
       result = { 'value' => result } unless result.is_a? Hash
       result = HashWithIndifferentAccess.new(result)

data/lib/wash_out/engine.rb

@@ -1,4 +1,19 @@
 module WashOut
   class Engine < ::Rails::Engine
+    class << self
+      attr_accessor :namespace
+      attr_accessor :snakecase
+    end
+
+    self.namespace = 'urn:WashOut'
+    self.snakecase = false
+
+    config.wash_out = ActiveSupport::OrderedOptions.new
+
+    initializer "wash_out.configuration" do |app|
+      app.config.wash_out.each do |key, value|
+        self.class.send "#{key}=", value
+      end
+    end
   end
 end

data/lib/wash_out/version.rb

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

data/spec/wash_out_spec.rb

@@ -3,6 +3,11 @@
 require 'spec_helper'
 
 describe WashOut do
+  before(:each) do
+    WashOut::Engine.snakecase = true
+    WashOut::Engine.namespace = false
+  end
+
   it "should be valid" do
     WashOut.should be_a(Module)
   end
@@ -81,19 +86,19 @@ describe WashOut do
     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 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 == {:"@xsi:type"=>"xsd:string"}
+  end
 
   it "should answer to request with one parameter" do
     mock_controller do
@@ -112,6 +117,23 @@ describe WashOut do
     end.to_hash[:check_answer_response][:value].should == false
   end
 
+  it "should handle snakecase option properly" do
+    WashOut::Engine.snakecase = false
+
+    mock_controller do
+      soap_action "rocknroll", :args => {:ZOMG => :string}, :return => nil
+      def rocknroll
+        params["ZOMG"].should == "yam!"
+        render :soap => nil
+      end
+    end
+
+    client = savon_instance
+    client.request(:rocknroll) do
+      soap.body = { "ZOMG" => 'yam!' }
+    end
+  end
+
   it "should answer to request with two parameter" do
     mock_controller do
       soap_action "funky", :args => { :a => :integer, :b => :string }, :return => :string

metadata

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