Merge pull request #673 from TiteiKo/master

closes #672 add unwrap option and pass it to Gyoku
savonrb · Mar 11, 2015 · fba39c6 · fba39c6
2 parents 217a4b7 + 81f3fe6
commit fba39c6
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/lib/savon/builder.rb b/lib/savon/builder.rb
@@ -166,7 +166,7 @@ def message
       element_form_default = @globals[:element_form_default] || @wsdl.element_form_default
       # TODO: clean this up! [dh, 2012-12-17]
       Message.new(message_tag, namespace_identifier, @types, @used_namespaces, @locals[:message],
-                  element_form_default, @globals[:convert_request_keys_to])
+                  element_form_default, @globals[:convert_request_keys_to], @globals[:unwrap])
     end
 
     def namespace_identifier

diff --git a/lib/savon/message.rb b/lib/savon/message.rb
@@ -4,7 +4,7 @@
 module Savon
   class Message
 
-    def initialize(message_tag, namespace_identifier, types, used_namespaces, message, element_form_default, key_converter)
+    def initialize(message_tag, namespace_identifier, types, used_namespaces, message, element_form_default, key_converter, unwrap)
       @message_tag = message_tag
       @namespace_identifier = namespace_identifier
       @types = types
@@ -13,6 +13,7 @@ def initialize(message_tag, namespace_identifier, types, used_namespaces, messag
       @message = message
       @element_form_default = element_form_default
       @key_converter = key_converter
+      @unwrap = unwrap
     end
 
     def to_s
@@ -25,7 +26,8 @@ def to_s
       gyoku_options = {
         :element_form_default => @element_form_default,
         :namespace            => @namespace_identifier,
-        :key_converter        => @key_converter
+        :key_converter        => @key_converter,
+        :unwrap               => @unwrap
       }
 
       Gyoku.xml(@message, gyoku_options)

diff --git a/lib/savon/options.rb b/lib/savon/options.rb
@@ -89,6 +89,7 @@ def initialize(options = {})
         :use_wsa_headers           => false,
         :no_message_tag            => false,
         :follow_redirects          => false,
+        :unwrap                    => false
       }
 
       options = defaults.merge(options)
@@ -287,6 +288,12 @@ def convert_request_keys_to(converter)
       @options[:convert_request_keys_to] = converter
     end
 
+    # Tell Gyoku to unwrap Array of Hashes
+    # Accepts a boolean, default to false
+    def unwrap(unwrap)
+      @options[:unwrap] = unwrap
+    end
+
     # Tell Nori how to convert XML tags from the SOAP response into Hash keys.
     # Accepts a lambda or a block which receives an XML tag and returns a Hash key.
     # Defaults to convert tags to snakecase Symbols.