lolsoap 0.8.3 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a60c39b2f4f03c4308d6f8c9dbcfa2b33c67eba3
-  data.tar.gz: e46ab60e8fcd3048c379c08544329bffe051f58d
+  metadata.gz: f3f35de62b3329ac274dbf69b5fd25052d22d41c
+  data.tar.gz: 306b20946e12d19ead01e087aebc890f28578f11
 SHA512:
-  metadata.gz: 099b596571f4f0d34bf41768e2819bcea1f5411457c6deb28d28090c6b480b571515bb87e8333cb411e47041fd2eaa7feacf73c12ba6ab43f446feda05b77965
-  data.tar.gz: 4ecf0b3962d57e6bf8e768e706414716df634633fc7f3ebbc3da1c0ea6df96eb86764ac1dba16c7acd891b2fac71e50d2a001b64d4920732c1882feac75d0b9e
+  metadata.gz: 65b2031d1b4ae9caa69bc9dadbe75a13b4d5b4adc48e0543db7959b0bcdf68c462e6e7e25d98242ba7edf27a946f833700a121888184e8bd9b74a3d55008d8b7
+  data.tar.gz: a1406021f4af3844a990c1b5085693bef493a02da5c326859cc8c612dfebe889f820f01478da73786e0383a6b5f703dfbe08ea55c9385b20242790477fe5bb6d

data/.gitignore

@@ -19,6 +19,8 @@ pkg
 
 Gemfile.lock
 
+Dockerfile
+
 # Have editor/IDE/OS specific files you need to ignore? Consider using a global gitignore: 
 #
 # * Create a file at ~/.gitignore

data/README.md

@@ -120,6 +120,10 @@ Development sponsored by [Loco2](http://loco2.com/).
 
 ## Changelog ##
 
+### 0.9 ###
+
+* Support unqualified form for elements in a schema
+
 ### 0.8 ###
 
 * Use namespaces when looking up definitions

data/lib/lolsoap/builder.rb

@@ -68,7 +68,21 @@ module LolSoap
       sub_node = @node.document.create_element(name.to_s, *args)
       sub_node.namespace = @node.namespace_scopes.find { |n| n.prefix == prefix }
 
-      @node << sub_node
+      # Nokogiri doesn't currently allow to add a child element without a
+      # namespace to a parent with a namespace: the child inherits the parent's
+      # namespace.  It's a known issue:
+      # https://github.com/sparklemotion/nokogiri/issues/1469 Until it's fixed,
+      # we'll use this workaround: store the parent's namespace, set it to nil
+      # temporarily, add the child and re-add the original namespace to the
+      # parent.
+      if sub_node.namespace.nil?
+        parent_namespace = @node.namespace
+        @node.namespace = nil
+        @node << sub_node
+        @node.namespace = parent_namespace
+      else
+        @node << sub_node
+      end
 
       builder = __class__.new(sub_node, sub_type)
       yield builder if block_given?

data/lib/lolsoap/version.rb

@@ -1,3 +1,3 @@
 module LolSoap
-  VERSION = "0.8.3"
+  VERSION = "0.9.0"
 end

data/lib/lolsoap/wsdl.rb

@@ -135,7 +135,7 @@ module LolSoap
       Element.new(
         self,
         params[:name],
-        prefix(params[:namespace]),
+        params[:namespace] && prefix(params[:namespace]),
         type_reference(params[:type]),
         params[:singular]
       )

data/lib/lolsoap/wsdl_parser.rb

@@ -6,25 +6,55 @@ module LolSoap
   class WSDLParser
     class ParseError < StandardError; end
 
+    class Schema < Struct.new(:target_namespace, :element_form_default)
+      UNQUALIFIED = 'unqualified'
+
+      def self.from_node(node)
+        new(
+          node.attr('targetNamespace').to_s,
+          node.attr('elementFormDefault')
+        )
+      end
+
+      def default_form
+        element_form_default || UNQUALIFIED
+      end
+    end
+
     class Node
-      attr_reader :parser, :node, :target_namespace, :name, :namespace
+      attr_reader :parser, :node, :schema, :name, :namespace
 
-      def initialize(parser, node, target_namespace)
-        @parser           = parser
-        @node             = node
-        @target_namespace = target_namespace
-        @namespace, @name = parser.namespace_and_name(node, node.attr('name').to_s, target_namespace)
+      def initialize(parser, schema, node)
+        @parser = parser
+        @node   = node
+        @schema = schema
       end
 
       def id
         [namespace, name]
       end
+
+      def target_namespace
+        schema.target_namespace
+      end
     end
 
     class Element < Node
+      QUALIFIED = 'qualified'
+
+      attr_reader :form
+
+      def initialize(*params)
+        super(*params)
+
+        @form = node.attr('form') || schema.default_form
+
+        @namespace, @name = parser.namespace_and_name(node, node.attr('name').to_s, default_namespace)
+      end
+
       def type
         if complex_type = node.at_xpath('xs:complexType', parser.ns)
-          type = Type.new(parser, complex_type, target_namespace)
+          type = Type.new(parser, schema, complex_type)
           {
             :elements   => type.elements,
             :namespace  => type.namespace,
@@ -39,6 +69,14 @@ module LolSoap
         max_occurs.empty? || max_occurs == '1'
       end
 
+      def qualified?
+        form == QUALIFIED
+      end
+
+      def default_namespace
+        target_namespace
+      end
+
       private
 
       def max_occurs
@@ -72,6 +110,12 @@ module LolSoap
     end
 
     class Type < Node
+      def initialize(*params)
+        super(*params)
+
+        @namespace, @name = parser.namespace_and_name(node, node.attr('name').to_s, target_namespace)
+      end
+
       def elements
         parent_elements.merge(own_elements)
       end
@@ -108,7 +152,8 @@ module LolSoap
 
       def element_nodes
         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)
+          element = TypeElement.new(parser, schema, el)
+
           if reference = el.attribute('ref')
             ReferencedElement.new(element, parser.element(*parser.namespace_and_name(el, reference.to_s)))
           else
@@ -140,6 +185,12 @@ module LolSoap
       end
     end
 
+    class TypeElement < Element
+      def default_namespace
+        target_namespace if qualified?
+      end
+    end
+
     class AttributeGroup < Node
       def attributes
         own_attributes + referenced_attributes
@@ -254,8 +305,8 @@ module LolSoap
     def types
       @types ||= begin
         types = {}
-        each_node('xs:complexType[not(@abstract="true")]') do |node, target_ns|
-          type = Type.new(self, node, target_ns)
+        each_node('xs:complexType[not(@abstract="true")]') do |node, schema|
+          type = Type.new(self, schema, node)
           types[type.id] = {
             :name       => type.name,
             :namespace  => type.namespace,
@@ -274,8 +325,8 @@ module LolSoap
     def elements
       @elements ||= begin
         elements = {}
-        each_node('xs:element') do |node, target_ns|
-          element = Element.new(self, node, target_ns)
+        each_node('xs:element') do |node, schema|
+          element = Element.new(self, schema, node)
           elements[element.id] = {
             :name      => element.name,
             :namespace => element.namespace,
@@ -378,11 +429,10 @@ module LolSoap
     end
 
     def each_node(xpath)
-      schemas.each do |schema|
-        target_namespace = schema.attr('targetNamespace').to_s
-
-        schema.xpath(xpath, ns).each do |node|
-          yield node, target_namespace
+      schemas.each do |schema_node|
+        schema = Schema.from_node(schema_node)
+        schema_node.xpath(xpath, ns).each do |node|
+          yield node, schema
         end
       end
     end
@@ -392,8 +442,8 @@ module LolSoap
       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)
+        schema = Schema.from_node(node.at_xpath('parent::xs:schema', ns))
+        node_class.new(self, schema, node)
       end
     end
   end

data/test/fixtures/stock_quote.wsdl

@@ -12,7 +12,8 @@
   <types>
     <schema targetNamespace="http://example.com/stockquote.xsd"
             xmlns:xsd3="http://example.com/stockquote.xsd"
-            xmlns="http://www.w3.org/2001/XMLSchema">
+            xmlns="http://www.w3.org/2001/XMLSchema"
+            elementFormDefault="qualified">
       <attributeGroup name="BaseRequestAttributes">
         <attribute name="signature" type="xs:string"/>
       </attributeGroup>

data/test/integration/test_envelope.rb

@@ -28,7 +28,7 @@ module LolSoap
       el.wont_equal nil
       el.text.to_s.must_equal 'LOCO2'
 
-      el = doc.at_xpath('//ns0:tradePriceRequest/ns0:specialTickerSymbol/ns1:name', doc.namespaces)
+      el = doc.at_xpath('//ns0:tradePriceRequest/ns0:specialTickerSymbol/name', doc.namespaces)
       el.wont_equal nil
       el.text.to_s.must_equal 'LOCOLOCOLOCO'
 

data/test/unit/test_builder.rb

@@ -35,6 +35,7 @@ module LolSoap
 
       doc.expect(:create_element, sub_node, args)
       sub_node.expect(:namespace=, nil, [namespace])
+      sub_node.expect(:namespace, namespace)
       node.children.expect(:<<, nil, [sub_node])
 
       yield sub_node

data/test/unit/test_wsdl_parser.rb

@@ -96,7 +96,7 @@ module LolSoap
             :elements  => {
               'name' => {
                 :name      => 'name',
-                :namespace => namespace2,
+                :namespace => nil,
                 :type      => [xs, "string"],
                 :singular  => true
               }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lolsoap
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.9.0
 platform: ruby
 authors:
 - Jon Leighton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-13 00:00:00.000000000 Z
+date: 2018-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.5.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: A library for dealing with SOAP requests and responses.