lolsoap 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 581a7842c694777a4af6b960f266eaebbf9e9431
-  data.tar.gz: 095e4cd38b1e59af2ff5514a560725f02d21b867
+  metadata.gz: 0b9bc4b76b05a3d31cba1d44dfbdcbe1ec345374
+  data.tar.gz: 3bc623601587f2e60ca3443767c02e73b69f2f60
 SHA512:
-  metadata.gz: d26800dfb89edd5bb9378a280d6be073d57ff8e273d1865b7b5cfde5ab5d83c9d3f757bb71df2213987c57c741947985d76127ea1e629b3c5e4cff963bcbd4e1
-  data.tar.gz: 44a08cfc2ecc91f15bcc54a442d37b912fe831d8a1bb013503efc52d392d2e04f2b0a5d4afeb684c28cbced4734048358544bef0b03195b566ee96966c95017e
+  metadata.gz: ccf49a609716134ab68a817fc59ee1e872767d812b5e35ae148d244c8a9a882afe96499ddacaf7c49c6f17c79c5c3d82f910da77f448cb6ada62f22b9d0083b5
+  data.tar.gz: c8b787f474363da4d866cfb6f1ba8419dc8275fed43f23667835f97112aa5d7495c666172a4f9127c8d789b4cd86eb274d3feeff94a4004fc87aab80695ffe3e

data/.travis.yml

@@ -1,5 +1,5 @@
 language: ruby
 rvm:
-  - 2.0.0
-  - 2.1.5
-  - 2.2.1
+  - 2.1.8
+  - 2.2.4
+  - 2.3.0

data/README.md

@@ -114,6 +114,11 @@ Development sponsored by [Loco2](http://loco2.com/).
 
 ## Changelog ##
 
+### 0.8 ###
+
+* Use namespaces when looking up definitions
+* Added support for referenced attribute groups
+
 ### 0.7 ###
 
 * Added support for element references in type definitions

data/lib/lolsoap/version.rb

@@ -1,3 +1,3 @@
 module LolSoap
-  VERSION = "0.7.0"
+  VERSION = "0.8.0"
 end

data/lib/lolsoap/wsdl_parser.rb

@@ -82,8 +82,8 @@ module LolSoap
 
       def base_type
         @base_type ||= begin
-          if extension = node.at_xpath('*/xs:extension/@base', parser.ns)
-            parser.type(extension.to_s)
+          if extension = node.at_xpath('*/xs:extension', parser.ns)
+            parser.type(*parser.namespace_and_name(extension, extension.attribute('base').to_s))
           end
         end
       end
@@ -110,7 +110,7 @@ module LolSoap
         node.xpath('*/xs:element | */*/xs:element | xs:complexContent/xs:extension/*/xs:element | xs:complexContent/xs:extension/*/*/xs:element', parser.ns).map { |el|
           element = Element.new(parser, el, target_namespace)
           if reference = el.attribute('ref')
-            ReferencedElement.new(element, parser.element(reference.to_s))
+            ReferencedElement.new(element, parser.element(*parser.namespace_and_name(el, reference.to_s)))
           else
             element
           end
@@ -122,14 +122,40 @@ module LolSoap
       end
 
       def own_attributes
+        defined_attributes + referenced_attributes
+      end
+
+      def defined_attributes
         node.xpath('xs:attribute/@name | */xs:extension/xs:attribute/@name', parser.ns).map(&:text)
       end
 
+      def referenced_attributes
+        node.xpath('xs:attributeGroup[@ref] | */xs:extension/xs:attributeGroup[@ref]', parser.ns).map { |group|
+          parser.attribute_group(*parser.namespace_and_name(group, group.attribute('ref').to_s))
+        }.flat_map(&:attributes)
+      end
+
       def parent_attributes
         base_type ? base_type.attributes : []
       end
     end
 
+    class AttributeGroup < Node
+      def attributes
+        own_attributes + referenced_attributes
+      end
+
+      def own_attributes
+        node.xpath('xs:attribute/@name', parser.ns).map(&:text)
+      end
+
+      def referenced_attributes
+        node.xpath('xs:attributeGroup[@ref]', parser.ns).map { |group|
+          parser.attribute_group(*parser.namespace_and_name(group, group.attribute('ref').to_s))
+        }.flat_map(&:attributes)
+      end
+    end
+
     class Operation
       attr_reader :parser, :node
 
@@ -241,8 +267,8 @@ module LolSoap
       end
     end
 
-    def type(name)
-      find_node name, Type, 'complexType'
+    def type(namespace, name)
+      find_node namespace, name, Type, 'complexType'
     end
 
     def elements
@@ -260,8 +286,12 @@ module LolSoap
       end
     end
 
-    def element(name)
-      find_node name, Element, 'element'
+    def element(namespace, name)
+      find_node namespace, name, Element, 'element'
+    end
+
+    def attribute_group(namespace, name)
+      find_node namespace, name, AttributeGroup, 'attributeGroup'
     end
 
     def messages
@@ -338,7 +368,11 @@ module LolSoap
     def namespace_and_name(node, prefixed_name, default_namespace = nil)
       if prefixed_name.include? ':'
         prefix, name = prefixed_name.split(':')
-        namespace = node.namespaces.fetch("xmlns:#{prefix}")
+        if prefix == 'tns' && schema = node.at_xpath('ancestor::xs:schema', ns)
+          namespace = schema.attribute('targetNamespace').to_s
+        else
+          namespace = node.namespaces.fetch("xmlns:#{prefix}")
+        end
       else
         name      = prefixed_name
         namespace = default_namespace
@@ -357,9 +391,11 @@ module LolSoap
       end
     end
 
-    def find_node(name, node_class, selector)
-      name = name.split(":").last
-      if node = doc.at_xpath("//xs:#{selector}[@name='#{name}']", ns)
+    def find_node(namespace, name, node_class, selector)
+      target = schemas.xpath("../xs:schema[@targetNamespace='#{namespace}']", ns)
+      target = schemas if target.size == 0
+
+      if node = target.at_xpath("xs:#{selector}[@name='#{name.split(':').last}']", ns)
         target_namespace = node.at_xpath('parent::xs:schema/@targetNamespace', ns).to_s
         node_class.new(self, node, target_namespace)
       end

data/test/fixtures/stock_quote.wsdl

@@ -13,6 +13,9 @@
     <schema targetNamespace="http://example.com/stockquote.xsd"
             xmlns:xsd3="http://example.com/stockquote.xsd"
             xmlns="http://www.w3.org/2001/XMLSchema">
+      <attributeGroup name="BaseRequestAttributes">
+        <attribute name="signature" type="xs:string"/>
+      </attributeGroup>
       <complexType name="Price">
         <simpleContent>
           <extension base="xs:string">
@@ -80,7 +83,7 @@
         <sequence>
           <element name="accountId" type="xs:string" maxOccurs="1"/>
         </sequence>
-        <attribute name="signature" type="xs:string"/>
+        <attributeGroup ref="tns:BaseRequestAttributes" />
       </complexType>
     </schema>
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lolsoap
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Jon Leighton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-12 00:00:00.000000000 Z
+date: 2016-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -157,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A library for dealing with SOAP requests and responses.