wsdl_validator 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5721216e68fd329ead13d82fec5844311619ca1
-  data.tar.gz: 664b2b8714a805638a1a007abfe4b99074017346
+  metadata.gz: d2ec12d204a349daf90dc9839b67b986079dd304
+  data.tar.gz: 2aa63bbe06189c30fe0edcf05ffa87cb2ae27b76
 SHA512:
-  metadata.gz: 99de3efea0b7c0eb1ab80ba1197dc478eee9aed2b2986ed16d7538d8a093867842637fdc45d03d128d10e990b50b461ffc6319b2baeb203bb84db669c6045f30
-  data.tar.gz: 3dde01fa78cb78f157d245e2b2af649320cd45a30fd6c608e5e6b91950491864cfad3805e00d6fe0c1f7e799f4459d02e9112bdfcc43bc1784c483fe6bf6934d
+  metadata.gz: fdad29cc37bf6f4b7d90f2a76a56df60be4b786678aec21374df1bbf1ccf258dc5dbd9b13a2fae62d085f28687645db05c8fd14f0b003110283b7085566f2b6d
+  data.tar.gz: 4733883570c6f93f93d730fbd755d13467acfe7b74c498e81153b0e2e4784eb939c0b8dab12a7a675b750a71ef5d035ad4beae2ec14563bb42c3fc47ecc87250

data/lib/wsdl_validator/version.rb

@@ -1,3 +1,3 @@
 class WsdlValidator
-  VERSION = '0.1.7'.freeze
+  VERSION = '0.1.8'.freeze
 end

data/lib/wsdl_validator/wsdl_validator.rb

@@ -17,9 +17,12 @@ class WsdlValidator
     self.doc = Wasabi.document wsdl_url
     self.show_schemas = parse_wsdl_schemas
     self.schemas = Nokogiri::XML::Schema(show_schemas)
-  rescue Wasabi::Resolver::HTTPError => e
-    raise WsdlValidator::Error, "Unauthorized for basic auth #{basic_auth}" if e.response.code == 401
-    raise e
+  rescue Wasabi::Resolver::HTTPError => resolver
+    raise WsdlValidator::Error, "Unauthorized for basic auth #{basic_auth}" if resolver.response.code == 401
+    raise resolver
+  rescue Nokogiri::XML::SyntaxError => syntax_error
+    puts "Error for " + show_schemas
+    raise syntax_error
   end
 
   # Gets the namespaces from the SOAP Envelope & Body element, adds them to the root element underneath the body
@@ -70,18 +73,31 @@ class WsdlValidator
   end
 
   # Join all the schemas within the WSDL, importing schemas if necessary
-  # @return [String] Schemas contained within WSDL
+  # @return [String] Schema XML contained within WSDL
   def parse_wsdl_schemas
     doc.parser.schemas.collect do |schema|
       imports = schema.children.select { |child| child.name == 'import' }
       imported_xsds = imports.collect do |import|
         extract_schema_for(import)
       end.join
-      schema = Nokogiri::XML(imported_xsds).children unless imported_xsds.empty?
-      schema.to_s
+      if imported_xsds.empty?
+        add_global_namespace_to(schema)
+      else
+        imported_schemas = Nokogiri::XML(imported_xsds).children
+        updated_set = imported_schemas.collect { |imported_schema| add_global_namespace_to(imported_schema) }
+        updated_set.join
+      end.to_s
     end.join
   end
 
+  # Add namespaces from wsdl document to each schema
+  # Sometimes schemas are defined there and referenced within the types
+  # @return [String] String representing XML with global schemas added
+  def add_global_namespace_to(schema)
+    doc.parser.document.collect_namespaces.each { |namespace, value| schema[namespace] = value }
+    schema.to_s
+  end
+
   # Makes a GET request returning the xsd from the defined location
   # @return [String] Schema from location defined in 'schemaLocation' attribute
   def extract_schema_for(import)

data/wsdl_validator.gemspec

@@ -29,6 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.16'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'savon'
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'sinatra'
   spec.add_development_dependency 'sinatra-basic-auth'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wsdl_validator
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Samuel Garratt
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-30 00:00:00.000000000 Z
+date: 2018-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpi
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: savon
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement