wash_out 0.5.3 → 0.5.4

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.5.4
+
+* Ability to manually specify `response_tag` for `soap_action` [@inossidabile][]
+
 ## 0.5.2
 
 * .NET-compliant response tags [@ebeigarts][]

data/app/views/wash_with_soap/response.builder

@@ -6,7 +6,7 @@ xml.tag! "soap:Envelope", "xmlns:soap" => 'http://schemas.xmlsoap.org/soap/envel
   xml.tag! "soap:Body" do
     key = "tns:#{@operation}#{WashOut::Engine.camelize_wsdl ? 'Response' : '_response'}"
 
-    xml.tag! key do
+    xml.tag! @action_spec[:response_tag] do
       wsdl_data xml, result
     end
   end

data/lib/wash_out/dispatcher.rb

@@ -104,9 +104,9 @@ module WashOut
 
     # Render a SOAP response.
     def _render_soap(result, options)
-      @namespace  = WashOut::Engine.namespace
-      @operation  = soap_action = request.env['wash_out.soap_action']
-      action_spec = self.class.soap_actions[soap_action][:out]
+      @namespace   = WashOut::Engine.namespace
+      @operation   = soap_action = request.env['wash_out.soap_action']
+      @action_spec = self.class.soap_actions[soap_action]
 
       result = { 'value' => result } unless result.is_a? Hash
       result = HashWithIndifferentAccess.new(result)
@@ -151,7 +151,7 @@ module WashOut
 
       render :template => 'wash_with_soap/response',
              :layout => false,
-             :locals => { :result => inject.call(result, action_spec) },
+             :locals => { :result => inject.call(result, @action_spec[:out]) },
              :content_type => 'text/xml'
     end
 

data/lib/wash_out/soap.rb

@@ -24,10 +24,14 @@ module WashOut
           end
         end
 
+        default_response_tag = WashOut::Engine.camelize_wsdl ? 'Response' : '_response'
+        default_response_tag = "tns:#{action}#{default_response_tag}"
+
         self.soap_actions[action] = {
-          :in     => WashOut::Param.parse_def(options[:args]),
-          :out    => WashOut::Param.parse_def(options[:return]),
-          :to     => options[:to] || action
+          :in           => WashOut::Param.parse_def(options[:args]),
+          :out          => WashOut::Param.parse_def(options[:return]),
+          :to           => options[:to] || action,
+          :response_tag => options[:response_tag] || default_response_tag
         }
       end
     end

data/lib/wash_out/version.rb

@@ -1,3 +1,3 @@
 module WashOut
-  VERSION = "0.5.3"
+  VERSION = "0.5.4"
 end

data/spec/lib/wash_out_spec.rb

@@ -136,6 +136,17 @@ describe WashOut do
     }.should raise_exception(Savon::SOAP::Fault)
   end
 
+  it "respects :response_tag option" do
+    mock_controller do
+      soap_action "specific", :response_tag => "test", :return => :string
+      def specific
+        render :soap => "test"
+      end
+    end
+
+    client.request(:specific).to_hash.should == {:test => {:value=>"test"}}
+  end
+
   it "should handle snakecase option properly" do
     WashOut::Engine.snakecase_input = false
     WashOut::Engine.camelize_wsdl   = false

metadata

@@ -1,172 +1,133 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: wash_out
-version: !ruby/object:Gem::Version 
-  hash: 1063984129097862891
+version: !ruby/object:Gem::Version
+  version: 0.5.4
   prerelease: 
-  segments: 
-  - 0
-  - 5
-  - 3
-  version: 0.5.3
 platform: ruby
-authors: 
+authors:
 - Boris Staal
 - Peter Zotov
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-12-01 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-12-11 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: nori
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70206231773920 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 2002549777813010636
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: savon
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70206231773920
+- !ruby/object:Gem::Dependency
+  name: savon
+  requirement: &70206231773180 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 2002549777813010636
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec-rails
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70206231773180
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: &70206231772680 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 2002549777813010636
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: guard
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70206231772680
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: &70206231772160 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 2002549777813010636
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: guard-rspec
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70206231772160
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: &70206231771680 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 2002549777813010636
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rb-inotify
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70206231771680
+- !ruby/object:Gem::Dependency
+  name: rb-inotify
+  requirement: &70206231771200 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 2002549777813010636
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rb-fsevent
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *70206231771200
+- !ruby/object:Gem::Dependency
+  name: rb-fsevent
+  requirement: &70206231770680 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 2002549777813010636
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: appraisal
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *70206231770680
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: &70206231770140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 2002549777813010636
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: tzinfo
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: *70206231770140
+- !ruby/object:Gem::Dependency
+  name: tzinfo
+  requirement: &70206231769520 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 2002549777813010636
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: pry
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: *70206231769520
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: &70206231768740 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 2002549777813010636
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id010
+  prerelease: false
+  version_requirements: *70206231768740
 description: Dead simple Rails 3 SOAP server library
 email: boris@roundlake.ru
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
 - .travis.yml
@@ -229,36 +190,26 @@ files:
 - wash_out.gemspec
 homepage: http://roundlake.github.com/wash_out/
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 2002549777813010636
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 2002549777813010636
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Dead simple Rails 3 SOAP server library
 test_files: []
-