soaspec 0.2.22 → 0.2.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f3a41968e523901e869b24522b1fe2c630518239fed2e3600f2e8f5b67a9fb5
-  data.tar.gz: f9af632f2e025cccf4da721120ca44e5aed446d0b5b2353e860d347fbfd28594
+  metadata.gz: 984b49dfa801f4f86aeca02b864d1a0077ad9b998bce7497f8566de102dd874b
+  data.tar.gz: d0dff6ccbaecb663de4af1fd10a70481ca02ed75934662760476c9567366d41e
 SHA512:
-  metadata.gz: a1eb7bf52e74e6c355bf5f078707a97998c90c6084caaae85e4647ad3750e1c5daa9f593f1dbb4aa4bc688a410fa1c3c04a13e06037949a53547d1c3b04305f4
-  data.tar.gz: 77f6623886cb834aac76e5bdc275bee97260ddec1d0277c7f57bdb042355d45b03e94902900526520d2ffd2b0e05a23c41980d6c5eae11eee8aadf3c0f4375b2
+  metadata.gz: f4274b58b4aa962229592148d4b45018bf7f3365f65012c7b4409e0f84fa912acd194bd2376e0563a30ad6c6b7dfa6567abfdf392cbb2999b7db4399893ac3ad
+  data.tar.gz: e0532bf5aef88377ae778649823068d4eb77ae8968f1c4a1204d59fedefb66b9c5361481396a5ef7fafd12caf396d42d411b2f02a9a5a9f9b96048e836a037a0

data/ChangeLog

@@ -1,3 +1,8 @@
+Version 0.2.23
+* Enhancement
+  * Interpreter handles XML Doc
+  * Get document_type_for complex element working. Hopefully should be able to handle WSDL with large response now
+
 Version 0.2.22
 * Bug Fix
   * Allow negated version of 'be_successful' to work

data/lib/soaspec/interpreter.rb

@@ -15,7 +15,7 @@ class Interpreter
         end
       elsif response.is_a? Hash
         :hash
-      elsif response.is_a? Nokogiri::XML::NodeSet
+      elsif response.is_a?(Nokogiri::XML::NodeSet) || response.is_a?(Nokogiri::XML::Document)
         :xml
       else
         :unknown

data/lib/soaspec/version.rb

@@ -1,3 +1,3 @@
 module Soaspec
-  VERSION = '0.2.22'.freeze
+  VERSION = '0.2.23'.freeze
 end

data/lib/soaspec/wsdl_generator.rb

@@ -71,6 +71,12 @@ module Soaspec
       !type.xpath("*/#{type.first.namespace.prefix}:enumeration").empty?
     end
 
+    # @param [Nokogiri::XML::Element] element
+    # @return [String] Name of element excluding namespace
+    def name_after_namespace(element)
+      value_after_namespace(element.name)
+    end
+
     # Return value of string after a namespace
     # @param [String] string String to parse for part after namespace
     # @return [String] Part after the namespace, demonstrated by ':'
@@ -95,7 +101,7 @@ module Soaspec
     # @param [Nokogiri::XML::Element] element Element to check
     # @return [Boolean] True if Nokogiri element is a complex type, that is, has a complexType element underneath itself
     def complex_type?(element)
-      element.children.any? { |child| child.name == 'complexType' }
+      element.children.any? { |child| name_after_namespace(child) == 'complexType' }
     end
 
     # @param [String, Symbol] underscore_separated Snakecase value to be converted to camel case
@@ -104,18 +110,26 @@ module Soaspec
       underscore_separated.to_s.split('_').collect(&:capitalize).join
     end
 
+    # Element at the root of an operation
+    # @param [Hash] op_details Hash with details from WSDL for an operation
+    def root_element_for(op_details)
+      root_element = @wsdl_schemas.at_xpath("//*[@name='#{op_details[:input]}']")
+      raise 'Operation has no input defined' if root_element.nil?
+
+      root_element
+    end
+
+    # Returns list of elements present at the root of an operation
     # @param [Hash] op_details Hash with details from WSDL for an operation
     # @return [Nokogiri::XML::NodeSet] List of the root elements in the SOAP body
     def root_elements_for(op_details)
       raise "'@wsdl_schemas' must be defined" if @wsdl_schemas.nil?
 
-      root_element = @wsdl_schemas.at_xpath("//*[@name='#{op_details[:input]}']")
-      raise 'Operation has no input defined' if root_element.nil?
-
+      root_element = root_element_for(op_details)
       schema_namespace = root_element.namespace.prefix
       root_type = root_element['type']
       if root_type
-        @wsdl_schemas.xpath("//*[@name='#{root_type.split(':').last}']//#{schema_namespace}:element")
+        @wsdl_schemas.xpath("//*[@name='#{value_after_namespace(root_type)}']//#{schema_namespace}:element")
       else
         return [] unless complex_type? root_element # Empty Array if there are no root elements
 
@@ -126,6 +140,7 @@ module Soaspec
     end
 
     # Adds documentation content for all children of XML element
+    # This will be an example yaml for setting SOAP requests
     # @param [Nokogiri::XML::Element] element Type to document for
     # @param [Integer] depth How many times to iterate depth for
     def document_type_for(element, depth = 1)
@@ -133,10 +148,10 @@ module Soaspec
       return unless depth < 6
 
       if complex_type? element
-        complex_type = element.children.find { |c| c.name == 'complexType' }
-        sequence = complex_type.children.find { |c| c.name == 'sequence' }
+        complex_type = element.children.find { |c| name_after_namespace(c) == 'complexType' }
+        sequence = complex_type.children.find { |c| name_after_namespace(c) == 'sequence' }
         sequence.children.select { |node| node.class == Nokogiri::XML::Element }.each do |sub_element|
-          document_type_for sub_element, depth += 1
+          document_type_for sub_element, depth + 1
         end
       else
         return "No type seen for #{element}, #{element.class}" unless element['type']
@@ -149,6 +164,7 @@ module Soaspec
       end
     end
 
+    # @todo This should return YAML rather than just set an instance variable
     # Makes a yaml string in a '@content' instance variable
     # @param [Nokogiri::XML::NodeSet] list List to convert to YAML
     def wsdl_to_yaml_for(list)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: soaspec
 version: !ruby/object:Gem::Version
-  version: 0.2.22
+  version: 0.2.23
 platform: ruby
 authors:
 - SamuelGarrattIQA
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-25 00:00:00.000000000 Z
+date: 2019-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler