lolsoap 0.1.1 → 0.1.2

data/README.md

@@ -3,7 +3,9 @@
 A library for dealing with SOAP requests and responses. We tear our hair
 out so you don't have to.
 
-https://github.com/loco2/lolsoap
+* Code: https://github.com/loco2/lolsoap
+* Gem: http://rubygems.org/gems/lolsoap
+* Docs: http://rubydoc.info/gems/lolsoap/frames
 
 [![Build Status](https://secure.travis-ci.org/loco2/lolsoap.png)](http://travis-ci.org/loco2/lolsoap)
 

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/lolsoap/hash_builder.rb

@@ -13,7 +13,7 @@ module LolSoap
       if children.any?
         children_hash
       else
-        node.text.to_s
+        content
       end
     end
 
@@ -30,19 +30,36 @@ module LolSoap
         element = type.element(child.name)
         output  = self.class.new(child, element.type).output
 
-        if Array === hash[child.name] || !element.singular?
+        if !element.singular?
           hash[child.name] ||= []
-          hash[child.name] << output
+        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?
         else
-          if hash.include?(child.name)
-            hash[child.name] = [hash[child.name]]
-            hash[child.name] << output
-          else
-            hash[child.name] = output
-          end
+          hash[child.name] = output
         end
       end
       hash
     end
+
+    # @private
+    def content
+      node.text.to_s unless nil_value?
+    end
+
+    # @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
+    end
   end
 end

data/lib/lolsoap/response.rb

@@ -9,7 +9,14 @@ module LolSoap
 
     # Create a new instance from a raw XML string
     def self.parse(request, raw)
-      new(request, Nokogiri::XML::Document.parse(raw))
+      new(
+        request,
+        Nokogiri::XML::Document.parse(
+          raw, nil, nil,
+          Nokogiri::XML::ParseOptions::DEFAULT_XML &
+            Nokogiri::XML::ParseOptions::STRICT
+        )
+      )
     end
 
     def initialize(request, doc)

data/lib/lolsoap/wsdl/element.rb

@@ -18,7 +18,7 @@ class LolSoap::WSDL
     end
 
     def inspect
-      "<LolSoap::WSDL::Element name=#{name.inspect} type=#{@type_name.inspect}>"
+      "<#{self.class} name=#{name.inspect} type=#{@type_name.inspect}>"
     end
 
     private

data/lib/lolsoap/wsdl/operation.rb

@@ -10,7 +10,7 @@ class LolSoap::WSDL
     end
 
     def inspect
-      "<LolSoap::WSDL::Operation " \
+      "<#{self.class} " \
       "action=#{action.inspect} " \
       "input=#{input.inspect}>"
     end

data/lib/lolsoap/wsdl/type.rb

@@ -26,7 +26,7 @@ class LolSoap::WSDL
     end
 
     def inspect
-      "<LolSoap::WSDL::Type " \
+      "<#{self.class} " \
       "name=#{(prefix + ':' + name).inspect} " \
       "elements=#{elements.inspect}>"
     end

data/lib/lolsoap/wsdl.rb

@@ -60,7 +60,7 @@ module LolSoap
     end
 
     def inspect
-      "<LolSoap::WSDL " \
+      "<#{self.class} " \
       "namespaces=#{namespaces.inspect} " \
       "operations=#{operations.keys.inspect} " \
       "types=#{types.keys.inspect}>"

data/lolsoap.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "lolsoap"
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jon Leighton"]
-  s.date = "2012-01-17"
+  s.date = "2012-04-02"
   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 = [
@@ -67,7 +67,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/loco2/lolsoap"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
+  s.rubygems_version = "1.8.15"
   s.summary = "A library for dealing with SOAP requests and responses."
 
   if s.respond_to? :specification_version then

data/test/unit/test_hash_builder.rb

@@ -123,5 +123,29 @@ module LolSoap
       builder = HashBuilder.new(node, LolTypes.person)
       builder.output.must_equal({ 'age' => ['20', '30', '40'] })
     end
+
+    it 'converts fields with xsi:nil attribute into nils' do
+      xml = Nokogiri::XML <<-XML
+        <name>
+          <firstName xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:nil="1" />
+        </name>
+      XML
+      node = xml.root
+
+      builder = HashBuilder.new(node, LolTypes.name)
+      builder.output.must_equal({ 'firstName' => nil })
+    end
+
+    it 'converts elements with xsi:nil attribute which can occur multiple times into empty arrays' do
+      xml = Nokogiri::XML <<-XML
+        <person>
+          <friends xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:nil="1" />
+        </person>
+      XML
+      node = xml.root
+
+      builder = HashBuilder.new(node, LolTypes.person)
+      builder.output.must_equal({ 'friends' => [] })
+    end
   end
 end

data/test/unit/test_response.rb

@@ -9,6 +9,12 @@ module LolSoap
 
     subject { Response.new(request, doc) }
 
+    describe '.parse' do
+      it 'raises an error if there is invalid XML' do
+        lambda { Response.parse(request, '<a') }.must_raise Nokogiri::XML::SyntaxError
+      end
+    end
+
     describe '#body' do
       it 'returns the first node under the envelope body' do
         subject.body.must_equal doc.at_xpath('/soap:Envelope/soap:Body/m:GetStockPriceResponse')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lolsoap
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-17 00:00:00.000000000 Z
+date: 2012-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &11712020 !ruby/object:Gem::Requirement
+  requirement: &21674480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *11712020
+  version_requirements: *21674480
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &11711180 !ruby/object:Gem::Requirement
+  requirement: &21672260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *11711180
+  version_requirements: *21672260
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &11709980 !ruby/object:Gem::Requirement
+  requirement: &21669620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *11709980
+  version_requirements: *21669620
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &11721600 !ruby/object:Gem::Requirement
+  requirement: &21273520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11721600
+  version_requirements: *21273520
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &11720660 !ruby/object:Gem::Requirement
+  requirement: &21271840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11720660
+  version_requirements: *21271840
 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: 1458853334656196452
+      hash: -3972436845554789040
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -145,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: A library for dealing with SOAP requests and responses.