soap4r-ng 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: feac1a1b6c95487a81f512a6140b042fb412fece
-  data.tar.gz: 07fd71acfbc506dd522a151d6ac450927452b3e7
+SHA256:
+  metadata.gz: b3cfbee8d5a5dbc5e4416c83cd11af3048e292043305392d03f536f9a8c51c64
+  data.tar.gz: b67f334fbb01dbb79ed85b5773dbf30c0d923d1c91c0f2e06d1d66f0fd6e0643
 SHA512:
-  metadata.gz: ea80f755cd8d36451727d5a572ce9e509efe93d562e3fa463fd1e379bf8b5a1f02c59466d3ba90aa64309e83417688c6e0b0004b9d31b0872b1aa3b68d329d82
-  data.tar.gz: 109b4f5fcdc2b3c98412c5e3ee1a8ae921eec1345e170681a1052afe04e82eba47656bcec78956e886bb3cc7f3b023d777b01a869f7028037667c734bd1f4599
+  metadata.gz: 6ba9dc6197fc4c73209df255cd9840a9220f34db791fcd54d191ef32d7b22d8cdb23461e785fb2beaffb5d58c02389898eab7a0b789017425cff4bc3e59c9f51
+  data.tar.gz: 15b63bc41c3c82597a2c90bae4904376d2aed2771d2239c19dfd0af31fb07a22b5ba9ce39086016ec230def7f8fa1325de00fc57b47953f5e9fa32574746901a

data/lib/soap/mapping/encodedregistry.rb

@@ -6,6 +6,11 @@
 # 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.
 
+# in 2.4, 2.5 Fixnum/Bignum aliased to 'Integer'
+FixnumShim = 1.class
+FIXNUM_PRESENT = FixnumShim.name == 'Fixnum'
+BignumShim = (10**20).class
+BIGNUM_PRESENT = BignumShim.name == 'Bignum'
 
 require 'soap/baseData'
 require 'soap/mapping/mapping'
@@ -122,7 +127,7 @@ class EncodedRegistry
 
   StringFactory = StringFactory_.new
   BasetypeFactory = BasetypeFactory_.new
-  FixnumFactory = FixnumFactory_.new
+  FixnumFactory = FixnumFactory_.new if FIXNUM_PRESENT
   DateTimeFactory = DateTimeFactory_.new
   ArrayFactory = ArrayFactory_.new
   Base64Factory = Base64Factory_.new
@@ -146,7 +151,6 @@ class EncodedRegistry
       {:derived_class => true}],
     [::Float,        ::SOAP::SOAPFloat,      BasetypeFactory,
       {:derived_class => true}],
-    [::Fixnum,       ::SOAP::SOAPInt,        FixnumFactory],
     [::Integer,      ::SOAP::SOAPInt,        BasetypeFactory,
       {:derived_class => true}],
     [::Integer,      ::SOAP::SOAPLong,       BasetypeFactory,
@@ -199,6 +203,8 @@ class EncodedRegistry
       {:type => XSD::QName.new(RubyCustomTypeNamespace, "SOAPException")}],
  ]
 
+  SOAPBaseMap << [FixnumShim, ::SOAP::SOAPInt, FixnumFactory] if FIXNUM_PRESENT
+
   RubyOriginalMap = [
     [::NilClass,     ::SOAP::SOAPNil,        BasetypeFactory],
     [::TrueClass,    ::SOAP::SOAPBoolean,    BasetypeFactory],
@@ -212,7 +218,6 @@ class EncodedRegistry
       {:derived_class => true}],
     [::Float,        ::SOAP::SOAPFloat,      BasetypeFactory,
       {:derived_class => true}],
-    [::Fixnum,       ::SOAP::SOAPInt,        FixnumFactory],
     [::Integer,      ::SOAP::SOAPInt,        BasetypeFactory,
       {:derived_class => true}],
     [::Integer,      ::SOAP::SOAPLong,       BasetypeFactory,
@@ -263,6 +268,8 @@ class EncodedRegistry
       {:type => XSD::QName.new(RubyCustomTypeNamespace, "SOAPException")}],
   ]
 
+  RubyOriginalMap << [FixnumShim, ::SOAP::SOAPInt, FixnumFactory] if FIXNUM_PRESENT
+
   attr_accessor :default_factory
   attr_accessor :excn_handler_obj2soap
   attr_accessor :excn_handler_soap2obj
@@ -411,7 +418,10 @@ private
   end
 
   def addextend2soap(node, obj)
-    return if [Symbol, Fixnum, Bignum, Float].any?{ |c| obj.is_a?(c) }
+    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)
+    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/rubytypeFactory.rb

@@ -6,6 +6,10 @@
 # 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.
 
+old_verbose, $VERBOSE = $VERBOSE, nil # silence warnings
+DATA_PRESENT = defined?(Data)
+DataShim = Kernel.const_get('Data') if DATA_PRESENT
+$VERBOSE = old_verbose
 
 module SOAP
 module Mapping
@@ -38,6 +42,7 @@ class RubytypeFactory < Factory
 
   def obj2soap(soap_class, obj, info, map)
     param = nil
+
     case obj
     when ::String
       unless @allow_original_mapping
@@ -193,7 +198,7 @@ class RubytypeFactory < Factory
         param.add('member', ele_member)
         addiv2soapattr(param, obj, map)
       end
-    when ::IO, ::Binding, ::Data, ::Dir, ::File::Stat,
+    when ::IO, ::Binding, DataShim, ::Dir, ::File::Stat,
         ::MatchData, Method, ::Proc, ::Process::Status, ::Thread,
         ::ThreadGroup, ::UnboundMethod
       return nil

data/lib/soap/property.rb

@@ -33,7 +33,9 @@ module SOAP
 #     aaa.hhh = iii
 #
 class Property
-  FrozenError = (RUBY_VERSION >= "1.9.0") ? RuntimeError : TypeError
+  unless defined?(FrozenError) # defined since 2.5
+    FrozenError = (RUBY_VERSION >= "1.9.0") ? RuntimeError : TypeError
+  end
 
   include Enumerable
 
@@ -327,4 +329,4 @@ private
 end
 
 
-end
+end

data/lib/soap/rpc/cgistub.rb

@@ -202,7 +202,7 @@ private
   HTTPVersion = WEBrick::HTTPVersion.new('1.0')       # dummy; ignored
 
   def run
-    res = WEBrick::HTTPResponse.new({:HTTPVersion => HTTPVersion})
+    res = WEBrick::HTTPResponse.new({:HTTPVersion => HTTPVersion, :Logger => logger})
     begin
       @log.info { "received a request from '#{ @remote_host }'" }
       if @fcgi
@@ -227,9 +227,12 @@ private
         r.send_http_header
         buf = res.body
       else
-        buf = ''
+        # since 2.5 it doesn't work with empty string in WEBRICK::HTTPResponse#send_header(socket)
+        # https://github.com/ruby/ruby/commit/c44978b99f0454b8f00674f2f407893c8c47248e
+        buf = StringIO.new
         res.send_response(buf)
-        buf.sub!(/^[^\r]+\r\n/, '')       # Trim status line.
+
+        buf = buf.string.sub(/^[^\r]+\r\n/, '')       # Trim status line.
       end
       @log.debug { "SOAP CGI Response:\n#{ buf }" }
       if @fcgi

data/lib/soap/rpc/httpserver.rb

@@ -41,6 +41,7 @@ class HTTPServer < Logger::Application
     @router = ::SOAP::RPC::Router.new(actor)
     @soaplet = ::SOAP::RPC::SOAPlet.new(@router)
     on_init
+
     @server = WEBrick::HTTPServer.new(@webrick_config)
     @server.mount('/soaprouter', @soaplet)
     if wsdldir = config[:WSDLDocumentDirectory]
@@ -58,7 +59,13 @@ class HTTPServer < Logger::Application
   end
 
   def shutdown
-    @server.shutdown if @server
+    if @server
+      @server.shutdown
+      while (@server.listeners.length > 0) && (@server.tokens.length > 0) && (@server.status != :Stop) 
+        sleep(0.25)
+      end
+      sleep(0.25) # One more for good measure.
+    end
   end
 
   def authenticator

data/lib/soap/version.rb

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

data/lib/xsd/xmlparser/oxparser.rb

@@ -28,7 +28,7 @@ class OxParser < XSD::XMLParser::Parser
       ::Ox.sax_parse(handler, string, {:symbolize=> false, :convert_special=> true, :skip=> :skip_return} )
     else
       # Use HTMLEntities Decoder.  Leave the special-character conversion alone and let HTMLEntities decode it for us.
-      ::Ox.sax_parse(handler, string, {})
+      ::Ox.sax_parse(handler, string, {:skip=> :skip_none})
     end
   end
   

metadata

@@ -1,43 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: soap4r-ng
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - Laurence A. Lee, Hiroshi NAKAMURA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-29 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: httpclient
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.6'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.6'
-- !ruby/object:Gem::Dependency
-  name: logger-application
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.2
+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
   beyond
 email: rubyjedi@gmail.com, nahi@ruby-lang.org
@@ -230,7 +202,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - none
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Soap4R-ng - Soap4R (as maintained by RubyJedi) for Ruby 1.8 thru 2.1 and