handsoap 1.1.6 → 1.1.7

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
-:patch: 6
+:patch: 7
 :major: 1
 :minor: 1
 :build: 

data/lib/handsoap/service.rb

@@ -226,12 +226,15 @@ module Handsoap
         end
         doc = make_envelope do |body,header|
           if options[:soap_header]
-            options[:soap_header].each_pair do |k,v|
-              header.add k,v
-            end
+            iterate_hash_array(header, options[:soap_header])
           end
           
-          body.add action
+          if options[:soap_body]
+            action_hash = { action => options[:soap_body] }
+            iterate_hash_array(body, action_hash)
+          else
+            body.add(action)
+          end
         end
         if block_given?
           yield doc.find(action)
@@ -248,6 +251,8 @@ module Handsoap
       end
     end
 
+
+
     # Async invocation
     #
     # Creates an XML document and sends it over HTTP.
@@ -319,6 +324,26 @@ module Handsoap
       return nil
     end
 
+
+
+    #Used to iterate over a Hash, that can include Hash, Array or String/Float/Integer etc and insert it in the correct element.
+    def iterate_hash_array(element, hash_array)
+      hash_array.each {|hash| iterate_hash_array(element, hash) } if hash_array.is_a?(Array)
+      hash_array.each do |name,value|
+        if value.is_a?(Hash)
+          element.add(name){|subelement| iterate_hash_array(subelement, value)}
+        elsif value.is_a?(Array)
+          element.add(name) do |subelement|
+            value.each do |item|
+              iterate_hash_array(subelement, item) if item.is_a?(Hash)
+            end
+          end
+        else
+          element.add name, value.to_s
+        end
+      end
+    end
+
     # Hook that is called when a new request document is created.
     #
     # You can override this to add namespaces and other elements that are common to all requests (Such as authentication).

data/lib/handsoap/xml_mason.rb

@@ -15,9 +15,9 @@ module Handsoap
       def initialize
         @namespaces = {}
       end
-      def add(node_name, value = nil, *flags) # :yields: Handsoap::XmlMason::Element
+      def add(node_name, value = nil, options = {}) # :yields: Handsoap::XmlMason::Element
         prefix, name = parse_ns(node_name)
-        node = append_child Element.new(self, prefix, name, value, flags)
+        node = append_child Element.new(self, prefix, name, value, options)
         if block_given?
           yield node
         end
@@ -105,7 +105,7 @@ module Handsoap
     end
 
     class Element < Node
-      def initialize(parent, prefix, node_name, value = nil, flags = []) # :yields: Handsoap::XmlMason::Element
+      def initialize(parent, prefix, node_name, value = nil, options = {}) # :yields: Handsoap::XmlMason::Element
         super()
 #         if prefix.to_s == ""
 #           raise "missing prefix"
@@ -115,8 +115,11 @@ module Handsoap
         @node_name = node_name
         @children = []
         @attributes = {}
+        if options[:attributes]
+          @attributes = options[:attributes]
+        end
         if not value.nil?
-          set_value value.to_s, *flags
+          set_value value.to_s, options
         end
         if block_given?
           yield self
@@ -142,14 +145,14 @@ module Handsoap
       end
       # Sets the inner text of this element.
       #
-      # By default the string is escaped, but you can pass the flag :raw to inject XML.
+      # By default the string is escaped, but you can pass the option flag :raw to inject XML.
       #
       # You usually won't need to call this method, but will rather use +add+
-      def set_value(value, *flags)
+      def set_value(value, options = {})
         if @children.length > 0
           raise "Element already has children. Can't set value"
         end
-        if flags && flags.include?(:raw)
+        if options && options.include?(:raw)
           @children = [RawContent.new(value)]
         else
           @children = [TextNode.new(value)]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: handsoap
 version: !ruby/object:Gem::Version 
-  version: 1.1.6
+  version: 1.1.7
 platform: ruby
 authors: 
 - Troels Knak-Nielsen
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-16 00:00:00 +01:00
+date: 2010-02-11 00:00:00 +01:00
 default_executable: 
 dependencies: []