wsdl_validator 0.1.7 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a5721216e68fd329ead13d82fec5844311619ca1
-  data.tar.gz: 664b2b8714a805638a1a007abfe4b99074017346
+SHA256:
+  metadata.gz: '0397f50c93168cacf5bd628c661e8d3cfc5f8a2ce69eeb49b7e90fad6ff9b289'
+  data.tar.gz: c04b16e8863353ad60c93ad5a948e0fd53ae6b0feb054392b5ea2d0c5bf41194
 SHA512:
-  metadata.gz: 99de3efea0b7c0eb1ab80ba1197dc478eee9aed2b2986ed16d7538d8a093867842637fdc45d03d128d10e990b50b461ffc6319b2baeb203bb84db669c6045f30
-  data.tar.gz: 3dde01fa78cb78f157d245e2b2af649320cd45a30fd6c608e5e6b91950491864cfad3805e00d6fe0c1f7e799f4459d02e9112bdfcc43bc1784c483fe6bf6934d
+  metadata.gz: e821760df7f679d5e23e4a20cf9ea3d030f8e2e8fc3ca8a0bd66e2db1a8e8b14b98424ae700d08d77bf4664a37b78f72fbfc6723651fb34b0b9db3d840e93eaa
+  data.tar.gz: 86d5eb2709e464691b607a6ade9b7eabe7a2a2babfa259939bffe0abbea69af742de986a8620db41b774bcac3e38420951d355462cba433df9b31ea31d36ca6f

data/.gitignore

@@ -10,3 +10,5 @@
 Gemfile.lock
 # rspec failure tracking
 .rspec_status
+
+logs

data/.gitlab-ci.yml

@@ -1,14 +1,10 @@
-before_script:
-  - apt-get update -qq && apt-get install -y -qq sqlite3 libsqlite3-dev nodejs
-  - ruby -v
-  - which ruby
-  - gem install bundler rake --no-ri --no-rdoc
-  - bundle install --jobs $(nproc)  "${FLAGS[@]}"
-
-rspec:
+test:
+  image: ruby:3.3
   stage: test
   script:
-    - bundle exec rake spec
+    - gem install bundler rake
+    - bundle install --jobs $(nproc)  "${FLAGS[@]}"
+    - bundle exec rake
   artifacts:
     paths:
       - coverage/
@@ -16,7 +12,7 @@ rspec:
 pages:
   stage: deploy
   dependencies:
-    - rspec
+    - test
   script:
     - mv coverage/ public/
   artifacts:
@@ -24,4 +20,4 @@ pages:
       - public
     expire_in: 30 days
   only:
-    - master
+    - master

data/README.md

@@ -30,6 +30,12 @@ wsdl.valid? xml_message
 ```
 => Returns true or raises an exception
 
+## Todo
+
+Validate
+
+* Including the SOAP header/body message structure.
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/wsdl_validator/version.rb

@@ -1,3 +1,4 @@
 class WsdlValidator
-  VERSION = '0.1.7'.freeze
+  # Version of Gem
+  VERSION = '0.2.0'.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.status == 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
@@ -55,6 +58,11 @@ class WsdlValidator
 
   alias validate valid?
 
+  # @return [Hash] All namespaces defined throughout Wsdl
+  def namespaces
+    doc.parser.document.collect_namespaces
+  end
+
   private
 
   # Returns an Array with basic auth in it
@@ -70,18 +78,34 @@ 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 imports.empty?
+        add_global_namespace_to schema
+      else
+        imported_xsds = imports.collect { |import| extract_schema_for(import) }.join
+        add_namespaces_to Nokogiri::XML(imported_xsds).children
+      end
     end.join
   end
 
+  # For each of the schemas add the namespaces defined in the WSDL
+  # @param [Nokogiri::XML::NodeSet] schemas Xsd schemas
+  # @return [String] Add namespaces from WSDL to each schema passed
+  def add_namespaces_to(schemas)
+    schemas.collect { |schema| add_global_namespace_to(schema) }.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)
+    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

@@ -1,4 +1,3 @@
-
 lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'wsdl_validator/version'
@@ -26,9 +25,11 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'nokogiri'
   spec.add_dependency 'wasabi'
 
-  spec.add_development_dependency 'bundler', '~> 1.16'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rackup'
   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.2.0
 platform: ruby
 authors:
 - Samuel Garratt
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2018-08-30 00:00:00.000000000 Z
+date: 2024-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpi
@@ -56,30 +56,44 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rackup
+  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: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +108,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
@@ -162,7 +190,7 @@ homepage: https://gitlab.com/samuel-garratt/wsdl_validator
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -177,9 +205,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Makes verifying a SOAP message against a WSDL easy.
 test_files: []