wash_out 0.3.2 → 0.3.3

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.3.3
+
+* Tiny fixes in wash_out behavior with inline arrays (#11, #12)
+* Ability to change namespace
+
 ## 0.3.2
 
 * WashOut doesn't check existance of parameters anymore you should do it yourself from now

data/README.md

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

data/lib/wash_out/dispatcher.rb

@@ -5,13 +5,15 @@ module WashOut
   # as a SOAP endpoint. It includes actions for generating WSDL and handling
   # SOAP requests.
   module Dispatcher
-    # Default Type namespace
-    NAMESPACE = 'urn:WashOut'
-
     # A SOAPError exception can be raised to return a correct SOAP error
     # 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']
@@ -62,7 +64,7 @@ module WashOut
     # This action generates the WSDL for defined SOAP methods.
     def _generate_wsdl
       @map       = self.class.soap_actions
-      @namespace = NAMESPACE
+      @namespace = namespace
       @name      = controller_path.gsub('/', '_')
 
       render :template => 'wash_with_soap/wsdl'
@@ -70,7 +72,7 @@ module WashOut
 
     # Render a SOAP response.
     def _render_soap(result, options)
-      @namespace  = NAMESPACE
+      @namespace  = namespace
       @operation  = soap_action = request.env['wash_out.soap_action']
       action_spec = self.class.soap_actions[soap_action][:out].clone
 

data/lib/wash_out/engine.rb

@@ -1,4 +1,4 @@
 module WashOut
   class Engine < ::Rails::Engine
   end
-end
+end

data/lib/wash_out/param.rb

@@ -31,15 +31,19 @@ module WashOut
       end
 
       data = data[key]
-      data = Array(data) if @multiplied
+      data = [data] if @multiplied && !data.is_a?(Array)
 
       if struct?
         if @multiplied
           data.map do |x|
-            map_struct(x) { |param, data, elem| param.load(data, elem) }
+            map_struct x do |param, data, elem|
+              param.load(data, elem)
+            end
           end
         else
-          map_struct(data) { |param, data, elem| param.load(data, elem) }
+          map_struct data do |param, data, elem|
+            param.load(data, elem)
+          end
         end
       else
         operation = case type
@@ -122,7 +126,9 @@ 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
+        if data.has_key? param.name
+          struct[param.name] = yield param, data, param.name
+        end
       end
 
       struct

data/lib/wash_out/version.rb

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

data/lib/wash_out.rb

@@ -15,6 +15,14 @@ module ActionDispatch::Routing
 end
 
 Mime::Type.register "application/soap+xml", :soap
+
 ActionController::Renderers.add :soap do |what, options|
   _render_soap(what, options)
+end
+
+module ActionView
+  class Base
+    cattr_accessor :washout_namespace
+    @@washout_namespace = false
+  end
 end

metadata

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