soap4r-ng 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ec08ba5accd7ec65e6304c09557a8da24d1c084f1d8da5a670cc43f170215d4
-  data.tar.gz: 511a26a5a90fedd8d1bca578b39bd3273f11bba64a41647e569107bdcad33461
+  metadata.gz: c35bbc2b8a935aa7ac62209afc47abd84db691861878863f58163f8cdfc86ef9
+  data.tar.gz: ee6fcded626fc828440e1a38a02070facd66f120baf55164fa2eb20b2b2c08cb
 SHA512:
-  metadata.gz: ad85078c39eed227b20ca73050e2c36cc272fa037b7afea634da3ecee9214f1941ce7c7a26a377f365a1303cfd7e986124ae317ecd85e2b5cb942ec4c7d8b215
-  data.tar.gz: 5f13e6fadeb0b16cad896050c67e6f9455b9c1684fb7f78a3009c1ea1508e8c0fe572884040ff83f02b4bece9644e5caf2bd15ae02908d5af63632eb7d52c088
+  metadata.gz: 9052b0804246c8fdc3f62288c00e03ab572a7bf0960d7a0ea658ff66ca68d5cf6ea280b7b466efac597fcbf166984119b118bd986009aa798eec96379bce15a8
+  data.tar.gz: fccb428ad847f1bb16ae74ad5249ae4a99783ac5beaddfa7f1393598cfede2cc5e5315f774d776352f3c9fcdd867899c07ce555e923b7d595c676694e7fcbca1

data/lib/soap/netHttpClient.rb

@@ -169,8 +169,10 @@ private
     unless no_proxy?(url)
       proxy_host = @proxy.host
       proxy_port = @proxy.port
+      proxy_user = @proxy.user
+      proxy_password = @proxy.password
     end
-    http = Net::HTTP::Proxy(proxy_host, proxy_port).new(url.host, url.port)
+    http = Net::HTTP::Proxy(proxy_host, proxy_port, proxy_user, proxy_password).new(url.host, url.port)
     if http.respond_to?(:set_debug_output)
       http.set_debug_output(@debug_dev)
     end

data/lib/soap/version.rb

@@ -3,7 +3,7 @@ module SOAP
   module VERSION #:nodoc:
     MAJOR = 2
     MINOR = 1
-    TINY  = 0
+    TINY  = 1
     STRING = [MAJOR, MINOR, TINY].join('.')
     
     FORK  = "SOAP4R-NG"

data/lib/wsdl/soap/classDefCreator.rb

@@ -274,8 +274,20 @@ private
     c.comment = "#{qname}"
     c.comment << "\nabstract" if typedef.abstract
     parentmodule = mapped_class_name(qname, mpath)
+    # Shared across both parse_elements calls below (and all of their
+    # recursive descendants) so that a name reachable through two
+    # independent paths -- e.g. two group refs each declaring an element
+    # called "shared" -- is detected as a collision no matter which branch
+    # of the content model it comes from.
+    varnames = {}
     init_lines, init_params =
-      parse_elements(c, typedef.elements, qname.namespace, parentmodule)
+      parse_elements(c, typedef.elements, qname.namespace, parentmodule, false, varnames)
+    if typedef.content && (WSDL::XMLSchema::Group === typedef.content)
+        g_init_lines, g_init_params =
+            parse_elements(c, typedef.content.refelement.elements, qname.namespace, parentmodule, false, varnames)
+        init_lines = (g_init_lines + init_lines)
+        init_params = (g_init_params + init_params)
+    end
     unless typedef.attributes.empty?
       define_attribute(c, typedef.attributes)
       init_lines << "@__xmlattr = {}"
@@ -286,7 +298,20 @@ private
     c
   end
 
-  def parse_elements(c, elements, base_namespace, mpath, as_array = false)
+  # varnames tracks every attribute/param name assigned so far across the
+  # whole recursive walk for one class (threaded through by the caller, and
+  # passed on unchanged to every recursive call below), so that a name
+  # reachable through two independent paths -- e.g. two group refs each
+  # declaring an element called "shared" -- collides no matter which branch
+  # of the content model it comes from. Without this, the second "shared"
+  # would emit an `attr_accessor :shared` and `def initialize(shared = nil)`
+  # entry identical to the first, silently wiring both onto the very same
+  # @shared ivar (a plain Array#uniq on init_params alone would only paper
+  # over the resulting SyntaxError, not this data loss: the two occurrences
+  # would remain last-write-wins instead of independently addressable). We
+  # instead suffix the repeat, the same way define_attribute already
+  # disambiguates colliding attribute constants below.
+  def parse_elements(c, elements, base_namespace, mpath, as_array = false, varnames = {})
     init_lines = []
     init_params = []
     any = false
@@ -317,6 +342,12 @@ private
         unless as_array
           attrname = safemethodname(name)
           varname = safevarname(name)
+          varnames[varname] ||= 0
+          if (varnames[varname] += 1) > 1
+            suffix = "_#{varnames[varname]}"
+            attrname += suffix
+            varname += suffix
+          end
           c.def_attr(attrname, true, varname)
           init_lines << "@#{varname} = #{varname}"
           if element.map_as_array?
@@ -328,21 +359,24 @@ private
         end
       when WSDL::XMLSchema::Sequence
         child_init_lines, child_init_params =
-          parse_elements(c, element.elements, base_namespace, mpath, as_array)
+          parse_elements(c, element.elements, base_namespace, mpath, as_array, varnames)
         init_lines.concat(child_init_lines)
         init_params.concat(child_init_params)
       when WSDL::XMLSchema::Choice
         child_init_lines, child_init_params =
-          parse_elements(c, element.elements, base_namespace, mpath, as_array)
+          parse_elements(c, element.elements, base_namespace, mpath, as_array, varnames)
         init_lines.concat(child_init_lines)
         init_params.concat(child_init_params)
       when WSDL::XMLSchema::Group
+        if element.ref && element.content.nil?
+            element.content = element.refelement
+        end
         if element.content.nil?
           warn("no group definition found: #{element}")
           next
         end
         child_init_lines, child_init_params =
-          parse_elements(c, element.content.elements, base_namespace, mpath, as_array)
+          parse_elements(c, element.content.elements, base_namespace, mpath, as_array, varnames)
         init_lines.concat(child_init_lines)
         init_params.concat(child_init_params)
       else
@@ -354,7 +388,10 @@ private
 
   def define_attribute(c, attributes)
     const = {}
-    unless attributes.empty?
+    # No __xmlattr-backed storage is needed when every attribute is fixed:
+    # their getters return the fixed literal directly and none of them get
+    # a setter (see below), so there's nothing left to read the hash for.
+    unless attributes.empty? || attributes.all? { |attribute| attribute.fixed }
       c.def_method("__xmlattr") do <<-__EOD__
           @__xmlattr ||= {}
         __EOD__
@@ -369,18 +406,37 @@ private
         constname += "_#{const[constname]}"
       end
       c.def_const(constname, dqname(name))
-      c.def_method(methodname) do <<-__EOD__
-          __xmlattr[#{constname}]
-        __EOD__
+      c.def_method(methodname) do
+        define_attribute_reader_body(attribute, constname)
       end
-      c.def_method(methodname + '=', 'value') do <<-__EOD__
-          __xmlattr[#{constname}] = value
-        __EOD__
+      # XSD's `fixed` value constraint means any value other than the fixed
+      # one is invalid, so there's no legitimate value a setter could ever
+      # assign; omit it entirely rather than generate a footgun.
+      unless attribute.fixed
+        c.def_method(methodname + '=', 'value') do <<-__EOD__
+            __xmlattr[#{constname}] = value
+          __EOD__
+        end
       end
       c.comment << "\n  #{methodname} - #{attribute_basetype(attribute) || '(any)'}"
     end
   end
 
+  # Per XML Schema Part 1 S3.2.1, a `fixed` or `default` value constraint
+  # means an omitted attribute is treated as if it were present with that
+  # value -- this was previously discarded at codegen time, silently
+  # dropping that XSD semantic. `fixed` wins if both are somehow set, since
+  # WSDL::XMLSchema::Attribute itself only ever populates one or the other.
+  def define_attribute_reader_body(attribute, constname)
+    if f = attribute.fixed
+      %Q{"#{f}"}
+    elsif d = attribute.default
+      %Q{__xmlattr[#{constname}] || "#{d}"}
+    else
+      "__xmlattr[#{constname}]"
+    end
+  end
+
   def create_arraydef(mpath, qname, typedef)
     classname = mapped_class_basename(qname, mpath)
     c = ClassDef.new(classname, '::Array')

data/lib/wsdl/soap/mappingRegistryCreatorSupport.rb

@@ -62,6 +62,11 @@ module MappingRegistryCreatorSupport
     parentmodule = var[:class]
     parsed_element =
       parse_elements(typedef.elements, qname.namespace, parentmodule, opt)
+    if typedef.content && (WSDL::XMLSchema::Group === typedef.content) && typedef.elements.empty?
+        g_parsed_element =
+            parse_elements(typedef.content.refelement.elements, qname.namespace, parentmodule, opt)
+        parsed_element = (g_parsed_element + parsed_element)        
+    end
     if typedef.choice?
       parsed_element.unshift(:choice)
     end

data/lib/wsdl/xmlSchema/group.rb

@@ -9,13 +9,14 @@
 
 require 'wsdl/info'
 require 'wsdl/xmlSchema/ref'
+require 'wsdl/xmlSchema/complexType'
 
 
 module WSDL
 module XMLSchema
 
 
-class Group < Info
+class Group < ComplexType
   include Ref
 
   attr_writer :name	# required
@@ -89,8 +90,9 @@ class Group < Info
     end
   end
 
-private
-
+  # No longer private: classDefCreator.rb and mappingRegistryCreatorSupport.rb
+  # both need to resolve a group ref's actual definition when generating code
+  # for a complexType whose sole content is a <xsd:group ref="..."/>.
   def refelement
     @refelement ||= (@ref ? root.collect_modelgroups[@ref] : nil)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: soap4r-ng
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Laurence A. Lee, Hiroshi NAKAMURA