lolsoap 0.1.3 → 0.1.4

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/lib/lolsoap/hash_builder.rb

@@ -10,38 +10,35 @@ module LolSoap
     end
 
     def output
-      if children.any?
+      if node.first_element_child
         children_hash
       else
         content
       end
     end
 
-    def children
-      @children ||= node.children.select(&:element?)
-    end
-
     private
 
     # @private
     def children_hash
       hash = {}
-      children.each do |child|
+      node.element_children.each do |child|
         element = type.element(child.name)
         output  = self.class.new(child, element.type).output
-
-        if !element.singular?
-          hash[child.name] ||= []
-        end
-
-        if hash.include?(child.name) && !(Array === hash[child.name])
-          hash[child.name] = [hash[child.name]]
-        end
-
-        if Array === hash[child.name]
-          hash[child.name] << output unless output.nil?
+        val     = hash[child.name]
+
+        if output
+          if val
+            if val.is_a?(Array)
+              val << output
+            else
+              hash[child.name] = [val, output]
+            end
+          else
+            hash[child.name] = element.singular? ? output : [output]
+          end
         else
-          hash[child.name] = output
+          hash[child.name] = element.singular? ? nil : []
         end
       end
       hash
@@ -54,12 +51,7 @@ module LolSoap
 
     # @private
     def nil_value?
-      parent.search('./*[@xsi:nil=1]', 'xsi' => "http://www.w3.org/2001/XMLSchema-instance").include?(node)
-    end
-
-    # @private
-    def parent
-      node.ancestors.first
+      node.attribute_with_ns('nil', 'http://www.w3.org/2001/XMLSchema-instance')
     end
   end
 end

data/lib/lolsoap/wsdl/element.rb

@@ -10,7 +10,7 @@ class LolSoap::WSDL
     end
 
     def type
-      wsdl.type(@type_name.split(':').last)
+      @type ||= wsdl.type(@type_name.split(':').last)
     end
 
     def singular?

data/lolsoap.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "lolsoap"
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jon Leighton"]
-  s.date = "2012-05-10"
+  s.date = "2012-05-17"
   s.description = "A library for dealing with SOAP requests and responses. We tear our hair out so you don't have to."
   s.email = "j@jonathanleighton.com"
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lolsoap
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-10 00:00:00.000000000 Z
+date: 2012-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &19657960 !ruby/object:Gem::Requirement
+  requirement: &11380260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *19657960
+  version_requirements: *11380260
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &19656880 !ruby/object:Gem::Requirement
+  requirement: &11379660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *19656880
+  version_requirements: *11379660
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &19656060 !ruby/object:Gem::Requirement
+  requirement: &11378960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *19656060
+  version_requirements: *11378960
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &19654620 !ruby/object:Gem::Requirement
+  requirement: &11378100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19654620
+  version_requirements: *11378100
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &19652600 !ruby/object:Gem::Requirement
+  requirement: &11392100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19652600
+  version_requirements: *11392100
 description: A library for dealing with SOAP requests and responses. We tear our hair
   out so you don't have to.
 email: j@jonathanleighton.com
@@ -136,7 +136,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1228360456934755075
+      hash: 4450731572727892655
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: