pgericson-handsoap 1.1.9 → 1.1.10

data/VERSION.yml

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

data/lib/handsoap/service.rb

@@ -226,12 +226,14 @@ module Handsoap
         end
         doc = make_envelope do |body,header|
           if options[:soap_header]
-            iterate_hash(header, options[:soap_header])
+            iterate_hash_array(header, options[:soap_header])
           end
           
-          body.add action
           if options[:soap_body]
-            iterate_hash(body, options[:soap_body])
+            action_hash = { action => options[:soap_body] }
+            iterate_hash_array(body, action_hash)
+          else
+            body.add(action)
           end
         end
         if block_given?
@@ -325,13 +327,16 @@ module Handsoap
 
 
     #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(element, hash)
-      hash.each do |name,value|
+    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(subelement, value)}
+          element.add(name){|subelement| iterate_hash_array(subelement, value)}
         elsif value.is_a?(Array)
-          value.each do |item|
-            element.add(name, iterate_hash(element,item)) if item.is_a?(Hash)
+          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

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,16 +1,17 @@
 --- !ruby/object:Gem::Specification 
 name: pgericson-handsoap
 version: !ruby/object:Gem::Version 
-  version: 1.1.9
+  version: 1.1.10
 platform: ruby
 authors: 
 - Troels Knak-Nielsen
 - Jimmi Westerberg
+- Peter Ericson
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-01-18 00:00:00 +01:00
+date: 2010-02-05 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -18,6 +19,7 @@ description: Handsoap is a library for creating SOAP clients in Ruby
 email: 
 - troelskn@gmail.com
 - frontend@unwire.dk
+- pg.ericson@gmail.com
 executables: []
 
 extensions: []