lolsoap 0.3.1 → 0.3.2

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/lib/lolsoap/wsdl_parser.rb

@@ -57,7 +57,7 @@ module LolSoap
 
       def base_type
         @base_type ||= begin
-          if extension = node.at_xpath('xs:complexContent/xs:extension/@base', parser.ns)
+          if extension = node.at_xpath('*/xs:extension/@base', parser.ns)
             parser.type(extension.to_s)
           end
         end
@@ -150,9 +150,10 @@ module LolSoap
 
     def type(name)
       name = prefix_and_name(name).last
-      node = doc.at_xpath("//xs:complexType[@name='#{name}']", ns)
-      target_namespace = node.at_xpath('parent::xs:schema/@targetNamespace', ns).to_s
-      Type.new(self, node, target_namespace)
+      if node = doc.at_xpath("//xs:complexType[@name='#{name}']", ns)
+        target_namespace = node.at_xpath('parent::xs:schema/@targetNamespace', ns).to_s
+        Type.new(self, node, target_namespace)
+      end
     end
 
     def elements

data/lolsoap.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "lolsoap"
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jon Leighton"]
-  s.date = "2013-06-25"
+  s.date = "2013-06-27"
   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 = [

data/test/fixtures/stock_quote.wsdl

@@ -13,10 +13,17 @@
     <schema targetNamespace="http://example.com/stockquote.xsd"
             xmlns:xsd3="http://example.com/stockquote.xsd"
             xmlns="http://www.w3.org/2001/XMLSchema">
+      <complexType name="Price">
+        <simpleContent>
+          <extension base="xs:string">
+            <attribute name="currency" type="xs:string"/>
+          </extension>
+        </simpleContent>
+      </complexType>
       <element name="TradePrice">
          <complexType>
            <all>
-             <element name="xsd3:price" type="xs:float"/>
+             <element name="xsd3:price" type="Price"/>
            </all>
          </complexType>
       </element>

data/test/integration/test_wsdl.rb

@@ -12,7 +12,7 @@ module LolSoap
         o.action.must_equal     'http://example.com/GetLastTradePrice'
       end
 
-      subject.types.length.must_equal 3
+      subject.types.length.must_equal 4
       subject.types['xsd1:TradePriceRequest'].tap do |t|
         t.prefix.must_equal 'xsd1'
       end

data/test/unit/test_wsdl_parser.rb

@@ -33,6 +33,12 @@ module LolSoap
     describe '#types' do
       it 'returns the types, with attributes and namespace' do
         subject.types.must_equal({
+          'xsd1:Price' => {
+            :prefix     => 'xsd1',
+            :name       => 'Price',
+            :elements   => {},
+            :attributes => ['currency']
+          },
           'xsd1:TradePriceRequest' => {
             :prefix   => 'xsd1',
             :name     => 'TradePriceRequest',
@@ -126,7 +132,7 @@ module LolSoap
                 'price' => {
                   :name     => 'price',
                   :prefix   => 'xsd1',
-                  :type     => 'xs:float',
+                  :type     => 'xsd1:Price',
                   :singular => true
                 }
               },

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lolsoap
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-25 00:00:00.000000000 Z
+date: 2013-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -164,7 +164,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -976470929
+      hash: 765502511
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: