lolsoap 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f3f35de62b3329ac274dbf69b5fd25052d22d41c
-  data.tar.gz: 306b20946e12d19ead01e087aebc890f28578f11
+SHA256:
+  metadata.gz: a09434296d2a8e8a79df7eaa09fb83e73b1204b0e5ef0bd806619c2fe3e4ef54
+  data.tar.gz: 1d20400665a1a131da2254eac6561b8dc8d25c24caab7638e6a45a545f772c94
 SHA512:
-  metadata.gz: 65b2031d1b4ae9caa69bc9dadbe75a13b4d5b4adc48e0543db7959b0bcdf68c462e6e7e25d98242ba7edf27a946f833700a121888184e8bd9b74a3d55008d8b7
-  data.tar.gz: a1406021f4af3844a990c1b5085693bef493a02da5c326859cc8c612dfebe889f820f01478da73786e0383a6b5f703dfbe08ea55c9385b20242790477fe5bb6d
+  metadata.gz: c45884341a7061d94cc33e6af9751f39ba843fbed09286aad8e8c8d97ef2c4822f68b805de3aacde826339f445b36d58a9b5aad6132a6f94e71d4cf750a9c6b4
+  data.tar.gz: d1b757bbc9d0426eb95bf4df758c6507420e42dc50ddd1dd5d8a84e0bc91db85f3a3b1fa29f789723ce25c4d27f68d33b669354b3fb65176f1ca9bf0c4a9bd95

data/README.md

@@ -120,6 +120,10 @@ Development sponsored by [Loco2](http://loco2.com/).
 
 ## Changelog ##
 
+### 0.10 ###
+
+* Added support for using WSDL with abstract types in operation definitions
+
 ### 0.9 ###
 
 * Support unqualified form for elements in a schema

data/lib/lolsoap/version.rb

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

data/lib/lolsoap/wsdl.rb

@@ -13,8 +13,8 @@ module LolSoap
     require 'lolsoap/wsdl/operation_io_part'
 
     # Create a new instance by parsing a raw string of XML
-    def self.parse(raw)
-      new(WSDLParser.parse(raw))
+    def self.parse(raw, options={})
+      new(WSDLParser.parse(raw), options)
     end
 
     # The SOAP endpoint URL
@@ -29,13 +29,15 @@ module LolSoap
     # The version of SOAP detected.
     attr_reader :soap_version
 
-    def initialize(parser)
-      @prefixes     = generate_prefixes(parser)
-      @namespaces   = prefixes.invert
-      @types        = load_types(parser)
-      @operations   = load_operations(parser)
-      @endpoint     = parser.endpoint
+    def initialize(parser, options={})
+      @prefixes = generate_prefixes(parser)
+      @namespaces = prefixes.invert
+      @abstract_types = load_types(parser.abstract_types)
+      @types = load_types(parser.types)
+      @operations = load_operations(parser)
+      @endpoint = parser.endpoint
       @soap_version = parser.soap_version
+      @allow_abstract_types = options[:allow_abstract_types]
     end
 
     # Hash of types declared by the service
@@ -43,9 +45,23 @@ module LolSoap
       Hash[@types.values.map { |t| [t.name, t] }]
     end
 
+    # Hash of abstract types declared by the service
+    def abstract_types
+      Hash[@abstract_types.values.map { |t| [t.name, t] }]
+    end
+
     # Get a single type, or a NullType if the type doesn't exist
     def type(namespace, name)
-      @types.fetch([namespace, name]) { NullType.new }
+      if @allow_abstract_types
+        @types.fetch([namespace, name]) { abstract_type(namespace, name) }
+      else
+        @types.fetch([namespace, name]) { NullType.new }
+      end
+    end
+
+    # Get a single abstract type, or a NullType if the type doesn't exist
+    def abstract_type(namespace, name)
+      @abstract_types.fetch([namespace, name]) { NullType.new }
     end
 
     # Hash of operations that are supported by the SOAP service
@@ -73,9 +89,9 @@ module LolSoap
     private
 
     # @private
-    def load_types(parser)
+    def load_types(types)
       Hash[
-        parser.types.map do |id, type|
+        types.map do |id, type|
           [id, build_type(type)]
         end
       ]

data/lib/lolsoap/wsdl_parser.rb

@@ -307,12 +307,18 @@ module LolSoap
         types = {}
         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,
-            :elements   => type.elements,
-            :attributes => type.attributes
-          }
+          types[type.id] = type_record(type)
+        end
+        types
+      end
+    end
+
+    def abstract_types
+      @abstract_types ||= begin
+        types = {}
+        each_node('xs:complexType[@abstract="true"]') do |node, schema|
+          type = Type.new(self, schema, node)
+          types[type.id] = type_record(type)
         end
         types
       end
@@ -446,5 +452,15 @@ module LolSoap
         node_class.new(self, schema, node)
       end
     end
+
+    private
+    def type_record(type)
+      {
+        :name       => type.name,
+        :namespace  => type.namespace,
+        :elements   => type.elements,
+        :attributes => type.attributes
+      }
+    end
   end
 end

data/lolsoap.gemspec

@@ -19,8 +19,8 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'nokogiri', '~> 1.5'
 
-  spec.add_development_dependency "bundler", "~> 1.7"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler", "~> 2.0"
+  spec.add_development_dependency "rake", "~> 12.3"
   spec.add_development_dependency "minitest", "~> 2.10.0"
   spec.add_development_dependency "yard"
 end

data/test/integration/test_wsdl.rb

@@ -28,6 +28,11 @@ module LolSoap
         o.input.body.content.name.must_equal 'historicalPriceRequest'
       end
 
+      subject.abstract_types.length.must_equal 1
+      subject.abstract_types.fetch('BaseRequest').tap do |t|
+        t.prefix.must_equal 'ns0'
+      end
+
       subject.types.length.must_equal 4
       subject.types.fetch('TradePriceRequest').tap do |t|
         t.prefix.must_equal 'ns0'

data/test/unit/test_wsdl.rb

@@ -59,8 +59,16 @@ module LolSoap
               :attributes => ['id'],
               :namespace  => namespace
             }
-         },
-         :elements => {
+          },
+          :abstract_types => {
+            [namespace, 'BaseBrush'] => {
+              :name => 'BaseBrush',
+              :elements => {},
+              :attributes => ['id'],
+              :namespace  => namespace
+            },
+          },
+          :elements => {
             [namespace, 'brush'] => {
               :name      => 'brush',
               :namespace => namespace,
@@ -172,6 +180,16 @@ module LolSoap
         end
       end
 
+      describe '#abstract_types' do
+        it 'returns a hash of abstract types' do
+          subject.abstract_types.length.must_equal 1
+
+          subject.abstract_types['BaseBrush'].tap do |t|
+            t.attributes.must_equal ['id']
+          end
+        end
+      end
+
       describe '#type' do
         it 'returns a single type' do
           subject.type(namespace, 'Brush').must_equal subject.types.fetch('Brush')
@@ -180,6 +198,28 @@ module LolSoap
         it 'returns a null object if a type is missing' do
           subject.type(namespace, 'FooBar').must_equal WSDL::NullType.new
         end
+
+        it 'returns a null object for abstract types' do
+          subject.type(namespace, 'BaseBrush').must_equal WSDL::NullType.new
+        end
+
+        describe 'when abstract types are allowed' do
+          subject { WSDL.new(parser, :allow_abstract_types => true) }
+
+          it 'returns an abstract type' do
+            subject.type(namespace, 'BaseBrush').must_equal subject.abstract_types.fetch('BaseBrush')
+          end
+        end
+      end
+
+      describe '#abstract_type' do
+        it 'returns a single type' do
+          subject.abstract_type(namespace, 'BaseBrush').must_equal subject.abstract_types.fetch('BaseBrush')
+        end
+
+        it 'returns a null object if a type is missing' do
+          subject.abstract_type(namespace, 'FooBar').must_equal WSDL::NullType.new
+        end
       end
     end
   end

data/test/unit/test_wsdl_parser.rb

@@ -107,6 +107,26 @@ module LolSoap
       end
     end
 
+    describe "#abstract_types" do
+      it 'returns the abstract types, with attributes and namespace' do
+        subject.abstract_types.must_equal({
+          [namespace, "BaseRequest"] => {
+            :name => "BaseRequest",
+            :namespace => "http://example.com/stockquote.xsd",
+            :elements => {
+              "accountId" => {
+                :name => "accountId",
+                :namespace => "http://example.com/stockquote.xsd",
+                :type => [xs, "string"],
+                :singular=>true
+              }
+            },
+            :attributes=>["signature"]
+          },
+        })
+      end
+    end
+
     describe '#elements' do
       it 'returns the elements with inline types' do
         subject.elements.must_equal({

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lolsoap
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Jon Leighton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-02 00:00:00.000000000 Z
+date: 2019-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.3'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -157,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A library for dealing with SOAP requests and responses.
@@ -183,4 +183,3 @@ test_files:
 - test/unit/test_wsdl_parser.rb
 - test/unit/wsdl/test_element.rb
 - test/unit/wsdl/test_type.rb
-has_rdoc: