wasabi 5.0.2 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c2fcd5cc7a06cd2a2dbc0e5831fa93900597437112fe5a4577a3f1d41dd8ee6
-  data.tar.gz: a24c316714d9d1a45be8aedc78dc6d27cb94d5b764151329df5e470f9ad2eb29
+  metadata.gz: af912c6da83bd8794f7929d89c792716f295b9949c6f6acf30211cdf7a608d9f
+  data.tar.gz: 7c4826039acd022be1150ddde566e3217653b594199a42b55de82a36c2225109
 SHA512:
-  metadata.gz: 753db3901caac3e839fffde3719db2f46d195e90573db014479fdeb8d446bc790dec2b60d790f03a011dd3494076cd47f612b20575e826f1a33ce66ffe793f8e
-  data.tar.gz: 481b8441fd566346a9ef6a6950eaa33c08c3c85e3d3f68a5e3c003cefcb78f91e34865500c2ef70d3aaec240d0efde6579f147b5e9fba414077fda2996ab7277
+  metadata.gz: 7ba504cc015d6b070728279f8a50bc0b4e46c5a375fca2b2a4912c20f3d731c2a37dea913380397e7d2bdc8317c3f38cbb27f4c204ca2b5954087bbb464de1cb
+  data.tar.gz: 207e7d588b64eab57a496b4de40fa5da60b75d140f3452714415d4400155b6d8fc4633907c402726d6c3ae0bc87e88942873f18d4b5cea4960afbb1b8b4f36eb

data/CHANGELOG.md

@@ -4,6 +4,15 @@
 
 - _Your new line here. Mind the style of prefix used in the rest of the document._
 
+## 5.1.0 (2024-10-27)
+
+- Segment declared types by namespace to distinguish distinct types by @RickSnyder in https://github.com/savonrb/wasabi/pull/57
+- Adjust input parsing by @pcai in https://github.com/savonrb/wasabi/pull/122
+
+## 5.0.3 (2024-07-20)
+
+- Relax faraday version restriction by @ChristopherBert in https://github.com/savonrb/wasabi/pull/120
+
 ## 5.0.2 (2024-02-27)
 
 - Fix input/output for style="rpc" operations ([#119](https://github.com/savonrb/wasabi/pull/119)). 

data/README.md

@@ -63,3 +63,8 @@ document.operations
 # => { :create_user => { :input => "createUser", :action => "createUser" },
 # =>   :find_user => { :input => "findUser", :action => "findUser" } }
 ```
+
+## Upgrading to Wasabi 5.x
+
+Wasabi 5.x adds support for (and defaults to) [Faraday](https://lostisland.github.io/faraday/#/) for its HTTP transport. For compatibility, it will continue to prefer 
+[HTTPI](https://github.com/savonrb/httpi) if it is present. Newer versions of Savon require Wasabi 5.x as part of the transition to Faraday.

data/lib/wasabi/document.rb

@@ -103,11 +103,13 @@ module Wasabi
       @type_namespaces ||= begin
         namespaces = []
 
-        parser.types.each do |type, info|
-          namespaces << [[type], info[:namespace]]
+        parser.types.each do |ns, types|
+          types.each do |type, info|
+            namespaces << [[type], info[:namespace]]
 
-          element_keys(info).each do |field|
-            namespaces << [[type, field], info[:namespace]]
+            element_keys(info).each do |field|
+              namespaces << [[type, field], info[:namespace]]
+            end
           end
         end if document
 
@@ -119,12 +121,14 @@ module Wasabi
       @type_definitions ||= begin
         result = []
 
-        parser.types.each do |type, info|
-          element_keys(info).each do |field|
-            field_type = info[field][:type]
-            tag, namespace = field_type.split(":").reverse
+        parser.types.each do |ns, types|
+          types.each do |type, info|
+            element_keys(info).each do |field|
+              field_type = info[field][:type]
+              tag, namespace = field_type.split(":").reverse
 
-            result << [[type, field], tag] if user_defined(namespace)
+              result << [[type, field], tag] if user_defined(namespace)
+            end
           end
         end if document
 

data/lib/wasabi/parser.rb

@@ -181,44 +181,45 @@ module Wasabi
     end
 
     def process_type(namespace, type, name)
-      @types[name] ||= { :namespace => namespace }
-      @types[name][:order!] = []
+      @types[namespace] ||= {}
+      @types[namespace][name] ||= { :namespace => namespace }
+      @types[namespace][name][:order!] = []
 
       type.xpath('./xs:sequence/xs:element', 'xs' => XSD).each do |inner|
         element_name = inner.attribute('name').to_s
-        @types[name][element_name] = { :type => inner.attribute('type').to_s }
+        @types[namespace][name][element_name] = { :type => inner.attribute('type').to_s }
 
         [ :nillable, :minOccurs, :maxOccurs ].each do |attr|
           if v = inner.attribute(attr.to_s)
-            @types[name][element_name][attr] = v.to_s
+            @types[namespace][name][element_name][attr] = v.to_s
           end
         end
 
-        @types[name][:order!] << element_name
+        @types[namespace][name][:order!] << element_name
       end
 
       type.xpath('./xs:complexContent/xs:extension/xs:sequence/xs:element', 'xs' => XSD).each do |inner_element|
         element_name = inner_element.attribute('name').to_s
-        @types[name][element_name] = { :type => inner_element.attribute('type').to_s }
+        @types[namespace][name][element_name] = { :type => inner_element.attribute('type').to_s }
 
-        @types[name][:order!] << element_name
+        @types[namespace][name][:order!] << element_name
       end
 
       type.xpath('./xs:complexContent/xs:extension[@base]', 'xs' => XSD).each do |inherits|
         base = inherits.attribute('base').value.match(/\w+$/).to_s
 
-        if @types[base]
+        if @types[namespace][base]
           # Reverse merge because we don't want subclass attributes to be overriden by base class
-          @types[name] = types[base].merge(types[name])
-          @types[name][:order!] = @types[base][:order!] | @types[name][:order!]
-          @types[name][:base_type] = base
+          @types[namespace][name] = types[namespace][base].merge(types[namespace][name])
+          @types[namespace][name][:order!] = @types[namespace][base][:order!] | @types[namespace][name][:order!]
+          @types[namespace][name][:base_type] = base
         else
           p = Proc.new do
-            if @types[base]
+            if @types[namespace][base]
               # Reverse merge because we don't want subclass attributes to be overriden by base class
-              @types[name] = @types[base].merge(@types[name])
-              @types[name][:order!] = @types[base][:order!] | @types[name][:order!]
-              @types[name][:base_type] = base
+              @types[namespace][name] = @types[namespace][base].merge(@types[namespace][name])
+              @types[namespace][name][:order!] = @types[namespace][base][:order!] | @types[namespace][name][:order!]
+              @types[namespace][name][:base_type] = base
             end
           end
           deferred_types << p
@@ -238,6 +239,7 @@ module Wasabi
       input_output_for(operation, 'output')
     end
 
+    # @return [namespace_id, message_type]
     def input_output_for(operation, input_output)
       operation_name = operation['name']
 
@@ -250,9 +252,13 @@ module Wasabi
 
       port_type_input_output = port_type_operation&.element_children&.find { |node| node.name == input_output }
 
+      # find the message for the portType operation
+      # if there is no message, we will use the operation name as the message name
+
       # TODO: Stupid fix for missing support for imports.
       # Sometimes portTypes are actually included in a separate WSDL.
       if port_type_input_output
+        # If the message attribute contains a colon, it means the message is namespaced.
         if port_type_input_output.attribute('message').to_s.include? ':'
           port_message_ns_id, port_message_type = port_type_input_output.attribute('message').to_s.split(':')
         else
@@ -261,13 +267,6 @@ module Wasabi
 
         message_ns_id, message_type = nil
 
-        soap_operation = operation.element_children.find { |node| node.name == 'operation' }
-
-        if soap_operation.nil? || soap_operation['style'] != 'rpc'
-          message_ns_id = port_message_ns_id
-          message_type = port_message_type
-        end
-
         # When there is a parts attribute in soap:body element, we should use that value
         # to look up the message part from messages array.
         input_output_element = operation.element_children.find { |node| node.name == input_output }
@@ -276,6 +275,7 @@ module Wasabi
           soap_body_parts = soap_body_element['parts'] if soap_body_element
         end
 
+        # look for any message part that matches the soap body parts
         message = @messages[port_message_type]
         port_message_part = message&.element_children&.find do |node|
           soap_body_parts.nil? ? (node.name == "part") : (node.name == "part" && node["name"] == soap_body_parts)
@@ -290,6 +290,22 @@ module Wasabi
           end
         end
 
+        # If the message is not found, we should use the operation name as the message name for document style operations
+        # applies only to output
+        if input_output == 'output'
+          # if the operation is document style and theres no port_message_part, we should use the operation_name
+          soap_operation = operation.element_children.find { |node| node.name == 'operation' }
+          if message_type.nil? && (soap_operation.nil? || soap_operation['style'] != 'rpc')
+            if port_message_part.nil?
+              message_ns_id = port_message_ns_id
+              message_type = operation_name
+            else
+              message_ns_id = port_message_ns_id
+              message_type = port_message_type
+            end
+          end
+        end
+
         # Fall back to the name of the binding operation
         if message_type
           [message_ns_id, message_type]

data/lib/wasabi/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Wasabi
-  VERSION = '5.0.2'
+  VERSION = '5.1.0'
 end

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: wasabi
 version: !ruby/object:Gem::Version
-  version: 5.0.2
+  version: 5.1.0
 platform: ruby
 authors:
 - Daniel Harrington
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-02-27 00:00:00.000000000 Z
+date: 2024-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.9'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.9'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -73,7 +79,7 @@ licenses:
 - MIT
 metadata:
   changelog_uri: https://github.com/savonrb/wasabi/blob/master/CHANGELOG.md
-  documentation_uri: https://www.rubydoc.info/gems/wasabi/5.0.2
+  documentation_uri: https://www.rubydoc.info/gems/wasabi/5.1.0
   source_code_uri: https://github.com/savonrb/wasabi
   bug_tracker_uri: https://github.com/savonrb/wasabi/issues
   rubygems_mfa_required: 'true'
@@ -92,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
 summary: A simple WSDL parser