soap4r-ng 2.0.4 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3cfbee8d5a5dbc5e4416c83cd11af3048e292043305392d03f536f9a8c51c64
-  data.tar.gz: b67f334fbb01dbb79ed85b5773dbf30c0d923d1c91c0f2e06d1d66f0fd6e0643
+  metadata.gz: 1ec08ba5accd7ec65e6304c09557a8da24d1c084f1d8da5a670cc43f170215d4
+  data.tar.gz: 511a26a5a90fedd8d1bca578b39bd3273f11bba64a41647e569107bdcad33461
 SHA512:
-  metadata.gz: 6ba9dc6197fc4c73209df255cd9840a9220f34db791fcd54d191ef32d7b22d8cdb23461e785fb2beaffb5d58c02389898eab7a0b789017425cff4bc3e59c9f51
-  data.tar.gz: 15b63bc41c3c82597a2c90bae4904376d2aed2771d2239c19dfd0af31fb07a22b5ba9ce39086016ec230def7f8fa1325de00fc57b47953f5e9fa32574746901a
+  metadata.gz: ad85078c39eed227b20ca73050e2c36cc272fa037b7afea634da3ecee9214f1941ce7c7a26a377f365a1303cfd7e986124ae317ecd85e2b5cb942ec4c7d8b215
+  data.tar.gz: 5f13e6fadeb0b16cad896050c67e6f9455b9c1684fb7f78a3009c1ea1508e8c0fe572884040ff83f02b4bece9644e5caf2bd15ae02908d5af63632eb7d52c088

data/lib/soap/baseData.rb

@@ -542,7 +542,7 @@ public
   end
 
   def to_s
-    str = ''
+    str = String.new
     self.each do |key, data|
       str << "#{key}: #{data}\n"
     end
@@ -1080,7 +1080,11 @@ private
     "#{typename}[" << ',' * (rank - 1) << ']'
   end
 
-  TypeParseRegexp = Regexp.new('^(.+)\[([\d,]*)\]$', nil, 'n')
+  # Regexp::NOENCODING doesn't exist pre-1.9 (part of Ruby's M17N overhaul);
+  # 0 (no special options) is the equivalent on 1.8.7, which has no
+  # per-string encoding concept for this flag to apply to in the first place.
+  TypeParseRegexp = Regexp.new('^(.+)\[([\d,]*)\]$',
+    defined?(Regexp::NOENCODING) ? Regexp::NOENCODING : 0)
 
   def self.parse_type(string)
     TypeParseRegexp =~ string

data/lib/soap/encodingstyle/aspDotNetHandler.rb

@@ -20,7 +20,7 @@ class ASPDotNetHandler < Handler
 
   def initialize(charset = nil)
     super(charset)
-    @textbuf = ''
+    @textbuf = String.new
     @decode_typemap = nil
   end
 
@@ -108,7 +108,7 @@ class ASPDotNetHandler < Handler
   end
 
   def decode_tag(ns, elename, attrs, parent)
-    @textbuf = ''
+    @textbuf = String.new
     o = SOAPUnknown.new(self, elename)
     o.parent = parent
     o
@@ -128,7 +128,7 @@ class ASPDotNetHandler < Handler
     end
 
     decode_textbuf(o)
-    @textbuf = ''
+    @textbuf = String.new
   end
 
   def decode_text(ns, text)

data/lib/soap/generator.rb

@@ -51,7 +51,7 @@ public
   end
 
   def generate(obj, io = nil)
-    @buf = io || ''
+    @buf = io || String.new
     @indent = ''
     @encode_char_regexp = get_encode_char_regexp()
 
@@ -270,7 +270,15 @@ private
   end
 
   def get_encode_char_regexp
-    ENCODE_CHAR_REGEXP[XSD::Charset.encoding] ||= Regexp.new("[#{EncodeMap.keys.join}]", nil, (RUBY_VERSION.to_f <= 1.8) ? XSD::Charset.encoding : nil) # RubyJedi: compatible with Ruby 1.8.6 and above
+    ENCODE_CHAR_REGEXP[XSD::Charset.encoding] ||= begin
+      if RUBY_VERSION.to_f <= 1.8
+        Regexp.new("[#{EncodeMap.keys.join}]", nil, XSD::Charset.encoding)
+      else
+        # the deprecated 3-arg form's kcode argument was already nil here
+        # (a no-op since Ruby 1.9), so there's nothing lost by dropping it.
+        Regexp.new("[#{EncodeMap.keys.join}]")
+      end
+    end
   end
 
   def find_handler(encodingstyle)

data/lib/soap/mapping/encodedregistry.rb

@@ -12,6 +12,42 @@ FIXNUM_PRESENT = FixnumShim.name == 'Fixnum'
 BignumShim = (10**20).class
 BIGNUM_PRESENT = BignumShim.name == 'Bignum'
 
+if RUBY_VERSION.to_f >= 3.4 && defined?(Warning) && Warning.respond_to?(:warn)
+  # Ruby 3.4+'s chilled-string deprecation notice fires every time
+  # addextend2soap (below) opens a string's singleton class to check for a
+  # prior #extend, even when it turns out not to be extended -- unavoidable
+  # without breaking test/soap/marshal/marshaltestlib.rb#test_extend_string's
+  # real, tested round-trip behavior (see the NOTE on addextend2soap).
+  # Installed once, permanently, rather than swapped in/out per call: this
+  # method can run concurrently from multiple WEBrick request threads, and a
+  # temporary swap-and-restore around each call would race between threads.
+  # Matched on both the message text AND this file's own path, so no other
+  # chilled-string warning -- from elsewhere in this library, a dependency
+  # like simplecov, or the embedding application -- is ever affected.
+  #
+  # The override itself is built via class_eval on a *string* rather than
+  # literal keyword-argument syntax (`category:`) in this file: this file
+  # must parse cleanly on every supported Ruby back to 1.8.7, and Ruby
+  # parses an entire file up front regardless of the RUBY_VERSION guard
+  # above being a runtime check -- literal keyword-arg syntax here would be
+  # a SyntaxError on any pre-2.0 Ruby long before that guard ever runs
+  # (confirmed: broke the whole file, and everything requiring it, on
+  # 1.8.7). A string is just inert data to the parser; it's only parsed as
+  # code, by class_eval, once we're already inside the version-gated branch.
+  class << Warning
+    alias_method :__soap4r_encodedregistry_original_warn, :warn
+  end
+  Warning.singleton_class.class_eval(<<-'RUBY', __FILE__, __LINE__ + 1)
+    def warn(message, category: nil)
+      if message.include?("literal string will be frozen in the future") &&
+         message.include?("soap/mapping/encodedregistry.rb")
+        return
+      end
+      __soap4r_encodedregistry_original_warn(message, category: category)
+    end
+  RUBY
+end
+
 require 'soap/baseData'
 require 'soap/mapping/mapping'
 require 'soap/mapping/typeMap'
@@ -421,6 +457,14 @@ private
     return if [Symbol, Integer, Float].any?{ |c| obj.is_a?(c) }
     return if FIXNUM_PRESENT && obj.is_a?(FixnumShim)
     return if BIGNUM_PRESENT && obj.is_a?(BignumShim)
+    # NOTE: test/soap/marshal/marshaltestlib.rb#test_extend_string
+    # deliberately extends a String value with a module and expects that
+    # extension to round-trip through SOAP marshal -- so plain (non-frozen)
+    # strings can't be skipped outright here, even though opening a
+    # singleton class on one (below) trips Ruby 3.4+'s chilled-string
+    # warning for any ordinary string literal that happens to pass through
+    # unextended. Not cleanly fixable without breaking that real behavior;
+    # left as a known, harmless, forward-looking warning.
     return if obj.is_a?(String) && obj.frozen?
     list = (class << obj; self; end).ancestors - obj.class.ancestors
     list = list.reject{|c| c.class == Class } ## As of Ruby 2.1 Singleton Classes are now included in the ancestry. Need to filter those out here.

data/lib/soap/mapping/literalregistry.rb

@@ -357,10 +357,12 @@ private
   # much memory for each singleton Object.  just instance_eval instead of it.
   def define_xmlattr_accessor(obj, qname)
     # untaint depends GenSupport.safemethodname
-    name = Mapping.safemethodname('xmlattr_' + qname.name).untaint
+    name = Mapping.safemethodname('xmlattr_' + qname.name)
+    name.untaint if RUBY_VERSION < '2.7'
     unless obj.respond_to?(name)
       # untaint depends QName#dump
-      qnamedump = qname.dump.untaint
+      qnamedump = qname.dump
+      qnamedump.untaint if RUBY_VERSION < '2.7'
       obj.instance_eval <<-EOS
         def #{name}
           @__xmlattr[#{qnamedump}]

data/lib/soap/mapping/mapping.rb

@@ -108,7 +108,7 @@ module Mapping
         e.set_backtrace(nil)
         raise e # ruby sets current caller as local backtrace of e => e2.
       rescue Exception => e
-	e.set_backtrace(remote_backtrace + e.backtrace[1..-1])
+	e.set_backtrace((remote_backtrace || []) + ((e.backtrace || [])[1..-1] || []))
         raise
       end
     else
@@ -167,7 +167,7 @@ module Mapping
   #
   def self.name2elename(name)
     name.to_s.gsub(/([^a-zA-Z0-9:_\-]+)/n) {
-      '.' << $1.unpack('H2' * $1.size).join('.')
+      '.' + $1.unpack('H2' * $1.size).join('.')
     }.gsub(/::/n, '..')
   end
 
@@ -333,7 +333,8 @@ module Mapping
     else
       values.each do |attr_name, value|
         # untaint depends GenSupport.safevarname
-        name = Mapping.safevarname(attr_name).untaint
+        name = Mapping.safevarname(attr_name)
+        name.untaint if RUBY_VERSION < '2.7'
         setter = name + "="
         if obj.respond_to?(setter)
           obj.__send__(setter, value)

data/lib/soap/mapping/registry.rb

@@ -107,9 +107,11 @@ private
   # much memory for each singleton Object.  just instance_eval instead of it.
   def __define_attr_accessor(qname)
     # untaint depends GenSupport.safemethodname
-    name = Mapping.safemethodname(qname.name).untaint
+    name = Mapping.safemethodname(qname.name)
+    name.untaint if RUBY_VERSION < '2.7'
     # untaint depends on QName#dump
-    qnamedump = qname.dump.untaint
+    qnamedump = qname.dump
+    qnamedump.untaint if RUBY_VERSION < '2.7'
     singleton = false
     unless self.respond_to?(name)
       singleton = true

data/lib/soap/mapping/rubytypeFactory.rb

@@ -8,7 +8,12 @@
 
 old_verbose, $VERBOSE = $VERBOSE, nil # silence warnings
 DATA_PRESENT = defined?(Data)
-DataShim = Kernel.const_get('Data') if DATA_PRESENT
+# DataShim must always be a defined class, since it's referenced unconditionally
+# in a `case/when` below. Ruby's old C-extension Data class was removed in 3.1,
+# then Ruby 3.2 introduced an unrelated Data.define -- so DATA_PRESENT is false
+# only on the 3.1.x line. Fall back to an anonymous class nothing will ever be
+# an instance of, so the `when` comparison is always valid but never matches.
+DataShim = DATA_PRESENT ? Kernel.const_get('Data') : Class.new
 $VERBOSE = old_verbose
 
 module SOAP

data/lib/soap/mimemessage.rb

@@ -225,7 +225,7 @@ class MIMEMessage
   end
 
   def content_str
-    str = ''
+    str = String.new
     @parts.each do |prt|
       str << "--" + boundary + "\r\n"
       str << prt.to_s + "\r\n"

data/lib/soap/rpc/httpserver.rb

@@ -42,7 +42,7 @@ class HTTPServer < Logger::Application
     @soaplet = ::SOAP::RPC::SOAPlet.new(@router)
     on_init
 
-    @server = WEBrick::HTTPServer.new(@webrick_config)
+    @server = new_webrick_server(@webrick_config)
     @server.mount('/soaprouter', @soaplet)
     if wsdldir = config[:WSDLDocumentDirectory]
       @server.mount('/wsdl', WEBrick::HTTPServlet::FileHandler, wsdldir)
@@ -137,6 +137,35 @@ class HTTPServer < Logger::Application
 
 private
 
+  # A short retry-on-EADDRINUSE, matching test/testutil.rb's existing
+  # TestUtil.webrick_server helper, applied here so it covers every caller
+  # (not just tests that happen to go through that helper). Note: the mass
+  # EADDRINUSE cascade seen across the test suite (most test files share a
+  # single fixed port) turned out to be caused by a genuinely orphaned
+  # server -- test/soap/header/test_authheader_cgi.rb's teardown could
+  # raise before reaching teardown_server, permanently leaking that test's
+  # listener for the rest of the run -- not by transient TIME_WAIT. This
+  # retry is still worth keeping as a real defensive measure, just don't
+  # rely on it alone to mask a genuine leak elsewhere.
+  def new_webrick_server(config)
+    try = 0
+    begin
+      WEBrick::HTTPServer.new(config)
+    rescue Errno::EADDRINUSE => e
+      sleep 1
+      # See test/testutil.rb's webrick_server for the full history and why
+      # this was pulled back down from 120 to 20 -- the real leak (Thread#kill
+      # racing WEBrick's own async shutdown cleanup in test teardown) is
+      # fixed now, so this only needs to cover transient scheduling delay,
+      # not a real leak. A large budget here actively hurts: sslsvr.rb (test
+      # SSL support script) calls into this same path, and its parent process
+      # blocks on a timeout-less read waiting for it to report a PID --
+      # confirmed a stuck retry here manifests as a multi-minute *silent
+      # hang* in CI (run 28892185757), not just a slow test.
+      ((try += 1) < 20) ? retry : raise(e)
+    end
+  end
+
   def attrproxy
     @router
   end

data/lib/soap/version.rb

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

data/lib/wsdl/parser.rb

@@ -62,7 +62,7 @@ public
   def parse(string_or_readable)
     @parsestack = []
     @lastnode = nil
-    @textbuf = ''
+    @textbuf = String.new
     @parser.do_parse(string_or_readable)
     @lastnode
   end

data/lib/wsdl/soap/classDefCreator.rb

@@ -43,7 +43,7 @@ class ClassDefCreator
   end
 
   def dump(type = nil)
-    result = "require 'xsd/qname'\n"
+    result = "require 'xsd/qname'\n".dup
     # cannot use @modulepath because of multiple classes
     if @modulepath
       result << "\n"

data/lib/wsdl/soap/classDefCreatorSupport.rb

@@ -130,7 +130,7 @@ private
   def dump_inout_type(param, element_definitions)
     if param
       message = param.find_message
-      params = ""
+      params = String.new
       message.parts.each do |part|
         name = safevarname(part.name)
         if part.type
@@ -158,7 +158,7 @@ private
 
   def dump_inputparam(input)
     message = input.find_message
-    params = ""
+    params = String.new
     message.parts.each do |part|
       params << ", " unless params.empty?
       params << safevarname(part.name)

data/lib/wsdl/soap/clientSkeltonCreator.rb

@@ -31,7 +31,7 @@ class ClientSkeltonCreator
     unless services
       raise RuntimeError.new("service not defined: #{service_name}")
     end
-    result = ""
+    result = String.new
     if @modulepath
       result << "\n"
       modulepath = @modulepath.respond_to?(:lines) ? @modulepath.lines : @modulepath # RubyJedi: compatible with Ruby 1.8.6 and above      
@@ -57,7 +57,7 @@ private
     assigned_method = collect_assigned_method(@definitions, porttype.name, @modulepath)
     drv_name = mapped_class_basename(porttype.name, @modulepath)
 
-    result = ""
+    result = String.new
     result << <<__EOD__
 endpoint_url = ARGV.shift
 obj = #{ drv_name }.new(endpoint_url)

data/lib/wsdl/soap/driverCreator.rb

@@ -32,7 +32,7 @@ class DriverCreator
   end
 
   def dump(porttype = nil)
-    result = "require 'soap/rpc/driver'\n\n"
+    result = String.new("require 'soap/rpc/driver'\n\n")
     if @modulepath
       modulepath = @modulepath.respond_to?(:lines) ? @modulepath.lines : @modulepath # RubyJedi: compatible with Ruby 1.8.6 and above
       modulepath.each do |name|

data/lib/wsdl/soap/encodedMappingRegistryCreator.rb

@@ -34,7 +34,7 @@ class EncodedMappingRegistryCreator
 
   def dump(varname)
     @varname = varname
-    result = ''
+    result = String.new
     str = dump_complextype
     unless str.empty?
       result << "\n" unless result.empty?

data/lib/wsdl/soap/literalMappingRegistryCreator.rb

@@ -36,7 +36,7 @@ class LiteralMappingRegistryCreator
 
   def dump(varname)
     @varname = varname
-    result = ''
+    result = String.new
     str = dump_complextype
     unless str.empty?
       result << "\n" unless result.empty?

data/lib/wsdl/soap/methodDefCreator.rb

@@ -37,7 +37,7 @@ class MethodDefCreator
   end
 
   def dump(name)
-    methoddef = ""
+    methoddef = String.new
     porttype = @definitions.porttype(name)
     binding = porttype.find_binding
     if binding
@@ -94,7 +94,7 @@ private
     if paramstr.empty?
       paramstr = '[]'
     else
-      paramstr = "[ " << paramstr.split(/\r?\n/).join("\n    ") << " ]"
+      paramstr = "[ " + paramstr.split(/\r?\n/).join("\n    ") + " ]"
     end
     definitions = <<__EOD__
 #{ndq(mdef.soapaction)},

data/lib/wsdl/soap/servantSkeltonCreator.rb

@@ -29,7 +29,7 @@ class ServantSkeltonCreator
   end
 
   def dump(porttype = nil)
-    result = ""
+    result = String.new
     if @modulepath
       result << "\n"
       modulepath = @modulepath.respond_to?(:lines) ? @modulepath.lines : @modulepath # RubyJedi: compatible with Ruby 1.8.6 and above      

data/lib/wsdl/xmlSchema/parser.rb

@@ -60,7 +60,7 @@ public
   def parse(string_or_readable)
     @parsestack = []
     @lastnode = nil
-    @textbuf = ''
+    @textbuf = String.new
     @parser.do_parse(string_or_readable)
     @lastnode
   end

data/lib/xsd/charset.rb

@@ -128,20 +128,27 @@ public
     end
   end
 
+  # Regexp::NOENCODING doesn't exist pre-1.9 (part of Ruby's M17N overhaul);
+  # these regexes match raw byte patterns regardless of string encoding, so
+  # on 1.8.7 -- which has no per-string encoding concept at all -- byte
+  # matching is just the default behavior and 0 (no special options) is the
+  # equivalent.
+  NOENCODING_OPT = defined?(Regexp::NOENCODING) ? Regexp::NOENCODING : 0
+
   # us_ascii = '[\x00-\x7F]'
   us_ascii = '[\x9\xa\xd\x20-\x7F]'	# XML 1.0 restricted.
-  USASCIIRegexp = Regexp.new("\\A#{us_ascii}*\\z", nil, 'n')
+  USASCIIRegexp = Regexp.new("\\A#{us_ascii}*\\z", NOENCODING_OPT)
 
   twobytes_euc = '(?:[\x8E\xA1-\xFE][\xA1-\xFE])'
   threebytes_euc = '(?:\x8F[\xA1-\xFE][\xA1-\xFE])'
   character_euc = "(?:#{us_ascii}|#{twobytes_euc}|#{threebytes_euc})"
-  EUCRegexp = Regexp.new("\\A#{character_euc}*\\z", nil, 'n')
+  EUCRegexp = Regexp.new("\\A#{character_euc}*\\z", NOENCODING_OPT)
 
   # onebyte_sjis = '[\x00-\x7F\xA1-\xDF]'
   onebyte_sjis = '[\x9\xa\xd\x20-\x7F\xA1-\xDF]'	# XML 1.0 restricted.
   twobytes_sjis = '(?:[\x81-\x9F\xE0-\xFC][\x40-\x7E\x80-\xFC])'
   character_sjis = "(?:#{onebyte_sjis}|#{twobytes_sjis})"
-  SJISRegexp = Regexp.new("\\A#{character_sjis}*\\z", nil, 'n')
+  SJISRegexp = Regexp.new("\\A#{character_sjis}*\\z", NOENCODING_OPT)
 
   # 0xxxxxxx
   # 110yyyyy 10xxxxxx
@@ -152,7 +159,7 @@ public
   fourbytes_utf8 = '(?:[\xF0-\xF7][\x80-\xBF][\x80-\xBF][\x80-\xBF])'
   character_utf8 =
     "(?:#{us_ascii}|#{twobytes_utf8}|#{threebytes_utf8}|#{fourbytes_utf8})"
-  UTF8Regexp = Regexp.new("\\A#{character_utf8}*\\z", nil, 'n')
+  UTF8Regexp = Regexp.new("\\A#{character_utf8}*\\z", NOENCODING_OPT)
 
   def Charset.is_us_ascii(str)
     USASCIIRegexp =~ str

data/lib/xsd/codegen/classdef.rb

@@ -42,7 +42,7 @@ class ClassDef < ModuleDef
   end
 
   def dump
-    buf = ""
+    buf = String.new
     unless @requirepath.empty?
       buf << dump_requirepath 
     end
@@ -110,7 +110,7 @@ private
   end
 
   def dump_attributes
-    str = ""
+    str = String.new
     @attrdef.each do |attrname, writable, varname|
       varname ||= attrname
       if attrname == varname

data/lib/xsd/codegen/methoddef.rb

@@ -39,7 +39,7 @@ class MethodDef
   end
 
   def dump
-    buf = ""
+    buf = String.new
     buf << dump_comment if @comment
     buf << dump_method_def
     buf << dump_definition if @definition and !@definition.empty?

data/lib/xsd/codegen/moduledef.rb

@@ -67,7 +67,7 @@ class ModuleDef
   end
 
   def dump
-    buf = ""
+    buf = String.new
     unless @requirepath.empty?
       buf << dump_requirepath 
     end
@@ -141,7 +141,7 @@ private
     @methoddef.each do |visibility, method|
       (methods[visibility] ||= []) << method
     end
-    str = ""
+    str = String.new
     [:public, :protected, :private].each do |visibility|
       if methods[visibility]
         str << "\n" unless str.empty?

data/lib/xsd/datatypes.rb

@@ -256,7 +256,7 @@ private
   def screen_data(d)
     if d.is_a?(String)
       # Integer("00012") => 10 in Ruby.
-      d.sub!(/^([+\-]?)0*(?=\d)/, "\\1")
+      d = d.sub(/^([+\-]?)0*(?=\d)/, "\\1")
     end
     screen_data_str(d)
   end
@@ -480,14 +480,14 @@ private
   end
 
   def _to_s
-    str = ''
+    str = String.new
     str << @sign if @sign
     str << 'P'
-    l = ''
+    l = String.new
     l << "#{ @year }Y" if @year.nonzero?
     l << "#{ @month }M" if @month.nonzero?
     l << "#{ @day }D" if @day.nonzero?
-    r = ''
+    r = String.new
     r << "#{ @hour }H" if @hour.nonzero?
     r << "#{ @min }M" if @min.nonzero?
     r << "#{ @sec }S" if @sec.nonzero?
@@ -568,7 +568,7 @@ module XSDDateTimeImpl
     if diffmin.zero?
       'Z'
     else
-      ((diffmin < 0) ? '-' : '+') << format('%02d:%02d',
+      ((diffmin < 0) ? '-' : '+') + format('%02d:%02d',
     	(diffmin.abs / 60.0).to_i, (diffmin.abs % 60.0).to_i)
     end
   end
@@ -629,8 +629,18 @@ private
     zonestr = $8
     data = DateTime.civil(year, mon, mday, hour, min, sec, tz2of(zonestr))
     if secfrac
-      diffday = secfrac.to_i.to_r / (10 ** secfrac.size) / DayInSec
-      data += diffday
+      if RUBY_VERSION.to_f >= 1.9
+        diffday = secfrac.to_i.to_r / (10 ** secfrac.size) / DayInSec
+        data += diffday
+      else
+        # DateTime#+ produces wildly wrong results for certain Rational
+        # values on Ruby 1.8.7's date library (confirmed directly: e.g.
+        # adding Rational(1, 86400000) sends the date to 4763 BC). Baking
+        # the fraction into DateTime.civil's own seconds argument instead
+        # of adding it afterwards avoids the buggy code path entirely.
+        fracval = secfrac.to_i.to_r / (10 ** secfrac.size)
+        data = DateTime.civil(year, mon, mday, hour, min, sec + fracval, tz2of(zonestr))
+      end
       # FYI: new! and jd_to_rjd are not necessary to use if you don't have
       # exceptional reason.
     end
@@ -683,8 +693,18 @@ private
     zonestr = $5
     data = DateTime.civil(1, 1, 1, hour, min, sec, tz2of(zonestr))
     if secfrac
-      diffday = secfrac.to_i.to_r / (10 ** secfrac.size) / DayInSec
-      data += diffday
+      if RUBY_VERSION.to_f >= 1.9
+        diffday = secfrac.to_i.to_r / (10 ** secfrac.size) / DayInSec
+        data += diffday
+      else
+        # DateTime#+ produces wildly wrong results for certain Rational
+        # values on Ruby 1.8.7's date library (confirmed directly: e.g.
+        # adding Rational(1, 86400000) sends the date to 4763 BC). Baking
+        # the fraction into DateTime.civil's own seconds argument instead
+        # of adding it afterwards avoids the buggy code path entirely.
+        fracval = secfrac.to_i.to_r / (10 ** secfrac.size)
+        data = DateTime.civil(1, 1, 1, hour, min, sec + fracval, tz2of(zonestr))
+      end
     end
     [data, secfrac]
   end

data/lib/xsd/mapping.rb

@@ -20,12 +20,12 @@ module XSD
 module Mapping
   MappingRegistry = SOAP::Mapping::LiteralRegistry.new
 
-  def self.obj2xml(obj, elename = nil, io = nil)
-    Mapper.new(MappingRegistry).obj2xml(obj, elename, io)
+  def self.obj2xml(obj, elename = nil, io = nil, options = {})
+    Mapper.new(MappingRegistry).obj2xml(obj, elename, io, options)
   end
 
-  def self.xml2obj(stream, klass = nil)
-    Mapper.new(MappingRegistry).xml2obj(stream, klass)
+  def self.xml2obj(stream, klass = nil, options = {})
+    Mapper.new(MappingRegistry).xml2obj(stream, klass, options)
   end
 
   class Mapper
@@ -39,8 +39,8 @@ module Mapping
       @registry = registry
     end
 
-    def obj2xml(obj, elename = nil, io = nil)
-      opt = MAPPING_OPT.dup
+    def obj2xml(obj, elename = nil, io = nil, options = {})
+      opt = MAPPING_OPT.dup.merge(options)
       unless elename
         if definition = @registry.elename_schema_definition_from_class(obj.class)
           elename = definition.elename
@@ -57,8 +57,9 @@ module Mapping
       generator.generate(soap, io)
     end
 
-    def xml2obj(stream, klass = nil)
-      parser = SOAP::Parser.new(MAPPING_OPT)
+    def xml2obj(stream, klass = nil, options = {})
+      opt = MAPPING_OPT.dup.merge(options)
+      parser = SOAP::Parser.new(opt)
       soap = parser.parse(stream)
       SOAP::Mapping.soap2obj(soap, @registry, klass)
     end

data/lib/xsd/qname.rb

@@ -33,6 +33,7 @@ class QName
   end
 
   def match(rhs)
+    return false unless rhs.is_a?(XSD::QName)
     if rhs.namespace and (rhs.namespace != @namespace)
       return false
     end
@@ -43,7 +44,7 @@ class QName
   end
 
   def ==(rhs)
-    !rhs.nil? and @namespace == rhs.namespace and @name == rhs.name
+    rhs.is_a?(XSD::QName) and @namespace == rhs.namespace and @name == rhs.name
   end
 
   def ===(rhs)

data/lib/xsd/xmlparser/libxmlparser.rb

@@ -6,15 +6,6 @@
 # redistribute it and/or modify it under the same terms of Ruby's license;
 # either the dual license version in 2003, or any later version.
 
-### WIP, 2015-June-13:  
-###
-### LibXML drops namespaces on Elements *AND* Attributes, which makes it impossible
-### to correctly associate Namespaces on Namespace-Declared Element Attributes when
-### more than one namespace exists.
-###
-### This issue is evident when you run test/soap/test_cookie.rb
-###
-
 require 'libxml'
 
 module XSD
@@ -22,113 +13,69 @@ module XMLParser
 
 
 class LibXMLParser < XSD::XMLParser::Parser
-  include ::LibXML::XML::SaxParser::Callbacks
-
+  # Parses via XML::Reader rather than the SaxParser callbacks used before.
+  # libxml-ruby's SAX2 callback (on_start_element_ns) never surfaces an
+  # attribute's own namespace prefix to Ruby: the C extension
+  # (ruby_xml_sax2_handler.c's start_element_ns_callback) only reads an
+  # attribute's local name and value, discarding the prefix/URI slots that
+  # libxml2 itself provides per attribute. That made it impossible to
+  # recognize namespace-qualified attributes such as xsi:type, xsi:nil, and
+  # xml:lang, which SOAP4R's demarshaller depends on to pick the right Ruby
+  # type -- values silently fell back to an untyped SOAP::Mapping::Object,
+  # or stayed raw strings instead of being cast to Integer/nil/etc. This gap
+  # is still present as of libxml-ruby 6.0.0 (2026); it isn't a matter of
+  # being on an old release.
+  #
+  # XML::Reader's per-attribute #name *does* return the full "prefix:local"
+  # form (confirmed against libxml-ruby 2.8.0, the version pinned for Ruby
+  # 1.9.3, through the current 3.x/6.x releases) -- matching exactly what
+  # REXML's tag_start and Ox's attr callbacks already hand back, so this
+  # mirrors their convention rather than trying to resolve namespace URIs
+  # itself.
   def do_parse(string_or_readable)
-    $stderr.puts "XSD::XMLParser::LibXMLParser.do_parse" if $DEBUG    
-    # string = string_or_readable.respond_to?(:read) ? string_or_readable.read : string_or_readable
-
+    $stderr.puts "XSD::XMLParser::LibXMLParser.do_parse" if $DEBUG
     @charset = 'utf-8'
-    string = StringIO.new(string_or_readable)
-    parser = LibXML::XML::SaxParser.io(string)
-    parser.callbacks = self
-    parser.parse
-  end
-
-  ENTITY_REF_MAP = {
-    'lt' => '<',
-    'gt' => '>',
-    'amp' => '&',
-    'quot' => '"',
-    'apos' => '\''
-  }
-
-  #def on_internal_subset(name, external_id, system_id)
-  #  nil
-  #end
-
-  #def on_is_standalone()
-  #  nil
-  #end
-
-  #def on_has_internal_subset()
-  #  nil
-  #end
-
-  #def on_has_external_subset()
-  #  nil
-  #end
-
-  #def on_start_document()
-  #  nil
-  #end
-
-  #def on_end_document()
-  #  nil
-  #end
-
-  def on_start_element_ns (name, attr_hash, prefix, uri, namespaces)
-    prefixed_ns = attr_hash.merge(Hash[namespaces.map{|k,v| ["xmlns:#{k}",v]}])
-    if prefix.nil?
-      start_element(name, prefixed_ns)
-    else
-      start_element("#{prefix}:#{name}", prefixed_ns)
+    string = string_or_readable.respond_to?(:read) ? string_or_readable.read : string_or_readable
+    reader = ::LibXML::XML::Reader.string(string)
+    while reader.read
+      case reader.node_type
+      when ::LibXML::XML::Reader::TYPE_ELEMENT
+        name = reader.name
+        attrs = read_attributes(reader)
+        empty = reader.empty_element?
+        start_element(name, attrs)
+        end_element(name) if empty
+      when ::LibXML::XML::Reader::TYPE_END_ELEMENT
+        end_element(reader.name)
+      when ::LibXML::XML::Reader::TYPE_TEXT,
+           ::LibXML::XML::Reader::TYPE_CDATA,
+           ::LibXML::XML::Reader::TYPE_SIGNIFICANT_WHITESPACE
+        characters(reader.value)
+      end
     end
+  rescue ::LibXML::XML::Error => e
+    raise ParseError.new(e.message)
   end
 
-  def on_end_element_ns (name, prefix, uri)
-    if prefix.nil?
-      end_element(name)
-    else
-      end_element("#{prefix}:#{name}")
-    end
-  end
-
-  def on_start_element (name, attr_hash)
-    # start_element(name, attr_hash)
-  end
-
-  def on_end_element(name)
-    # end_element(name)
-  end
-
-  def on_reference(name)
-    characters(ENTITY_REF_MAP[name])
-  end
-
-  def on_characters(chars)
-    characters(chars)
-  end
-
-  #def on_processing_instruction(target, data)
-  #  nil
-  #end
-
-  #def on_comment(msg)
-  #  nil
-  #end
-
-  def on_parser_warning(msg)
-    warn(msg)
-  end
-
-  def on_parser_error(msg)
-    raise ParseError.new(msg)
-  end
-
-  def on_parser_fatal_error(msg)
-    raise ParseError.new(msg)
-  end
-
-  def on_cdata_block(cdata)
-    characters(cdata)
-  end
+  add_factory(self)
 
-  def on_external_subset(name, external_id, system_id)
-    nil
+  private
+
+  # Attribute names come back in literal "prefix:local" form already (see
+  # do_parse comment above), including xmlns:* declarations -- which are
+  # themselves just attributes as far as the reader is concerned, so no
+  # separate namespace-merging step is needed.
+  def read_attributes(reader)
+    attrs = {}
+    return attrs unless reader.has_attributes?
+    if reader.move_to_first_attribute == 1
+      begin
+        attrs[reader.name] = reader.value
+      end while reader.move_to_next_attribute == 1
+      reader.move_to_element
+    end
+    attrs
   end
-
-  add_factory(self)
 end
 
 

metadata

@@ -1,16 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: soap4r-ng
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.1.0
 platform: ruby
 authors:
 - Laurence A. Lee, Hiroshi NAKAMURA
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-21 00:00:00.000000000 Z
-dependencies: []
-description: Soap4R NextGen (as maintained by RubyJedi) for Ruby 1.8 thru 2.1 and
+date: 1980-01-02 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: httpclient
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: logger-application
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Soap4R NextGen (as maintained by RubyJedi) for Ruby 1.8.7 thru 4.0 and
   beyond
 email: rubyjedi@gmail.com, nahi@ruby-lang.org
 executables:
@@ -185,7 +212,6 @@ homepage: http://rubyjedi.github.io/soap4r/
 licenses:
 - Ruby
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -201,10 +227,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - none
-rubyforge_project: 
-rubygems_version: 2.7.7
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
-summary: Soap4R-ng - Soap4R (as maintained by RubyJedi) for Ruby 1.8 thru 2.1 and
+summary: Soap4R-ng - Soap4R (as maintained by RubyJedi) for Ruby 1.8.7 thru 4.0 and
   beyond
 test_files: []