soap4r-ng 2.0.2 → 2.0.3

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NGUzYWNmZGNlNjY4N2IxODlkNmJmMjU5ZGE5ZjFhOGQzMTc3MWI1Zg==
-  data.tar.gz: !binary |-
-    NWMxMzE3YzQ4Yjk1MmFmMzIzYTIzNDc2ODQzNjdlNTc1NGRkNjJmOA==
+SHA1:
+  metadata.gz: feac1a1b6c95487a81f512a6140b042fb412fece
+  data.tar.gz: 07fd71acfbc506dd522a151d6ac450927452b3e7
 SHA512:
-  metadata.gz: !binary |-
-    YTU4OTNmOGMyMzgwNjdiMmI5NzZjNzY4OThjY2NhZjhiNTcxYTZhNDJiMWQ0
-    ZjRjZTdmNDBmMGNiM2RhYmM3Y2Q4MTk5ZWJkMGNhZWRkOTJhZmY5YWVhNDNj
-    NDY1YzNiMTQ3ZTExYzdlMDQ5OTNlY2NiMzBkNzE4YTkwYWQxYWE=
-  data.tar.gz: !binary |-
-    NzJkOWY3YjE3MGM5OTc2OTU5MDg1YTY2OGNhMzA2MzhlM2UyMTk1MDFkZDhl
-    YmQxYTI3MTQwYjg1N2JjZWMwMTU1Mjc0ZjVhMTA2NzYzZDU2YWVlN2M5N2Ni
-    Mjg3NmMxZmQzNWEyMGI3ZjdhZDZiOGFmNDUzMWVjMTE1ODVjNGU=
+  metadata.gz: ea80f755cd8d36451727d5a572ce9e509efe93d562e3fa463fd1e379bf8b5a1f02c59466d3ba90aa64309e83417688c6e0b0004b9d31b0872b1aa3b68d329d82
+  data.tar.gz: 109b4f5fcdc2b3c98412c5e3ee1a8ae921eec1345e170681a1052afe04e82eba47656bcec78956e886bb3cc7f3b023d777b01a869f7028037667c734bd1f4599

data/lib/soap/element.rb

@@ -104,7 +104,7 @@ class SOAPBody < SOAPStruct
     if data
       if data.respond_to?(:to_xmlpart)
         data = SOAP::SOAPRawData.new(data)
-      elsif defined?(::REXML::Element) and data.is_a?(::REXML::Element)
+      elsif defined?(::REXML) && defined?(::REXML::Element) && data.is_a?(::REXML::Element)
         data = SOAP::SOAPRawData.new(SOAP::SOAPREXMLElementWrap.new(data))
       end
       if data.respond_to?(:elename)

data/lib/soap/mapping/mapping.rb

@@ -127,7 +127,7 @@ module Mapping
   def self._obj2soap(obj, registry, type = nil)
     if obj.respond_to?(:to_xmlpart)
       SOAPRawData.new(obj)
-    elsif defined?(::REXML::Element) and obj.is_a?(::REXML::Element)
+    elsif defined?(::REXML) && defined?(::REXML::Element) && obj.is_a?(::REXML::Element)
       SOAPRawData.new(SOAPREXMLElementWrap.new(obj))
     elsif referent = Thread.current[:SOAPMapping][:MarshalKey][obj.__id__] and
         !Thread.current[:SOAPMapping][:NoReference]

data/lib/soap/soap.rb

@@ -16,8 +16,7 @@ require 'soap/version'
 module SOAP
 
 
-# VERSION = Version = SOAP::VERSION::STRING # '1.5.8-HEAD'
-Version = SOAP::VERSION::STRING # '1.5.8-HEAD'
+Version = SOAP::VERSION::STRING # evaluates to 'SOAP4R-NG 2.0.2' or later
 PropertyName = 'soap/property'
 
 EnvelopeNamespace = 'http://schemas.xmlsoap.org/soap/envelope/'
@@ -152,3 +151,13 @@ unless Kernel.respond_to?(:warn)
     end
   end
 end
+
+
+# For Ruby 1.8 and below
+unless Kernel.respond_to?(:require_relative)
+  module Kernel
+    def require_relative(path)
+      require File.join(File.dirname(caller[0]), path.to_str)
+    end
+  end
+end

data/lib/soap/streamHandler.rb

@@ -143,7 +143,7 @@ public
 
   def initialize(options)
     super()
-    @client = Client.new(nil, "RUBYJEDI-SOAP4R/#{ Version }")
+    @client = Client.new(nil, SOAP::VERSION::FORK_STRING)
     if @client.respond_to?(:request_filter)
       @client.request_filter << HttpPostRequestFilter.new(@filterchain)
     end

data/lib/soap/version.rb

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

data/lib/wsdl/soap/wsdl2ruby.rb

@@ -77,6 +77,7 @@ private
     check_file(@classdef_filename) or return
     write_file(@classdef_filename) do |f|
       f.puts "# encoding: UTF-8"
+      f.puts "# Generated by wsdl2ruby (#{::SOAP::VERSION::FORK_STRING})\n"
       f << WSDL::SOAP::ClassDefCreator.new(@wsdl, @name_creator, @modulepath).dump
     end
   end
@@ -87,7 +88,8 @@ private
     check_file(@mr_filename) or return
     write_file(@mr_filename) do |f|
       f.puts "# encoding: UTF-8"
-      f << "require '#{@classdef_filename}'\n" if @classdef_filename
+      f.puts "# Generated by wsdl2ruby (#{::SOAP::VERSION::FORK_STRING})\n"
+      f << "require_relative '#{@classdef_filename}'\n" if @classdef_filename
       f << WSDL::SOAP::MappingRegistryCreator.new(@wsdl, @name_creator, @modulepath).dump
     end
   end
@@ -101,7 +103,8 @@ private
     write_file(@client_skelton_filename) do |f|
       f << shbang << "\n"
       f.puts "# encoding: UTF-8"
-      f << "require '#{@driver_filename}'\n\n" if @driver_filename
+      f.puts "# Generated by wsdl2ruby (#{::SOAP::VERSION::FORK_STRING})\n"
+      f << "require_relative '#{@driver_filename}'\n\n" if @driver_filename
       f << WSDL::SOAP::ClientSkeltonCreator.new(@wsdl, @name_creator, @modulepath).dump(create_name(servicename))
     end
   end
@@ -112,7 +115,8 @@ private
     check_file(@servant_skelton_filename) or return
     write_file(@servant_skelton_filename) do |f|
       f.puts "# encoding: UTF-8"
-      f << "require '#{@classdef_filename}'\n\n" if @classdef_filename
+      f.puts "# Generated by wsdl2ruby (#{::SOAP::VERSION::FORK_STRING})\n"
+      f << "require_relative '#{@classdef_filename}'\n\n" if @classdef_filename
       f << WSDL::SOAP::ServantSkeltonCreator.new(@wsdl, @name_creator, @modulepath).dump(create_name(porttypename))
     end
   end
@@ -125,8 +129,9 @@ private
     write_file(@cgi_stubFilename) do |f|
       f << shbang << "\n"
       f.puts "# encoding: UTF-8"
-      f << "require '#{@servant_skelton_filename}'\n" if @servant_skelton_filename
-      f << "require '#{@mr_filename}'\n" if @mr_filename
+      f.puts "# Generated by wsdl2ruby (#{::SOAP::VERSION::FORK_STRING})\n"
+      f << "require_relative '#{@servant_skelton_filename}'\n" if @servant_skelton_filename
+      f << "require_relative '#{@mr_filename}'\n" if @mr_filename
       f << WSDL::SOAP::CGIStubCreator.new(@wsdl, @name_creator, @modulepath).dump(create_name(servicename))
     end
   end
@@ -139,8 +144,9 @@ private
     write_file(@standalone_server_stub_filename) do |f|
       f << shbang << "\n"
       f.puts "# encoding: UTF-8"
-      f << "require '#{@servant_skelton_filename}'\n" if @servant_skelton_filename
-      f << "require '#{@mr_filename}'\n" if @mr_filename
+      f.puts "# Generated by wsdl2ruby (#{::SOAP::VERSION::FORK_STRING})\n"
+      f << "require_relative '#{@servant_skelton_filename}'\n" if @servant_skelton_filename
+      f << "require_relative '#{@mr_filename}'\n" if @mr_filename
       f << WSDL::SOAP::StandaloneServerStubCreator.new(@wsdl, @name_creator, @modulepath).dump(create_name(servicename))
     end
   end
@@ -153,8 +159,9 @@ private
     write_file(@servlet_stub_filename) do |f|
       f << shbang << "\n"
       f.puts "# encoding: UTF-8"
-      f << "require '#{@servant_skelton_filename}'\n" if @servant_skelton_filename
-      f << "require '#{@mr_filename}'\n" if @mr_filename
+      f.puts "# Generated by wsdl2ruby (#{::SOAP::VERSION::FORK_STRING})\n"
+      f << "require_relative '#{@servant_skelton_filename}'\n" if @servant_skelton_filename
+      f << "require_relative '#{@mr_filename}'\n" if @mr_filename
       f << WSDL::SOAP::ServletStubCreator.new(@wsdl, @name_creator, @modulepath).dump(create_name(servicename))
     end
   end
@@ -167,8 +174,9 @@ private
     check_file(@driver_filename) or return
     write_file(@driver_filename) do |f|
       f.puts "# encoding: UTF-8"
-      f << "require '#{@classdef_filename}'\n" if @classdef_filename
-      f << "require '#{@mr_filename}'\n" if @mr_filename
+      f.puts "# Generated by wsdl2ruby (#{::SOAP::VERSION::FORK_STRING})\n"
+      f << "require_relative '#{@classdef_filename}'\n" if @classdef_filename
+      f << "require_relative '#{@mr_filename}'\n" if @mr_filename
       f << creator.dump(create_name(porttypename))
     end
   end

data/lib/xsd/xmlparser/libxmlparser.rb

@@ -25,6 +25,7 @@ class LibXMLParser < XSD::XMLParser::Parser
   include ::LibXML::XML::SaxParser::Callbacks
 
   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
 
     @charset = 'utf-8'

data/lib/xsd/xmlparser/nokogiriparser.rb

@@ -13,12 +13,18 @@ module XMLParser
 
 class NokogiriParser < XSD::XMLParser::Parser
   def do_parse(string_or_readable)
+    $stderr.puts "XSD::XMLParser::NokogiriParser.do_parse" if $DEBUG    
     handler = NokoDocHandler.new(self)
     parser = Nokogiri::XML::SAX::Parser.new(handler)    
     parser.parse(string_or_readable)
   end
 
   add_factory(self)
+  
+  public :start_element
+  public :end_element
+  public :characters
+  public :xmldecl_encoding=
 end
 
 
@@ -27,29 +33,28 @@ class NokoDocHandler < Nokogiri::XML::SAX::Document
     @owner = (owner)
   end
 
+  def xmldecl(version, encoding, standalone)
+    @owner.xmldecl_encoding= encoding
+  end
+
   def start_element(name,attrs)
-    attr_hash = Hash.new
-    attrs.each do |kv_array|
-      attr_hash[kv_array[0]] = kv_array[1]
-    end
-    @owner.send(:start_element, name, attr_hash)
+    @owner.start_element(name,Hash[*attrs.flatten])
   end
   
   def end_element(name)
-    @owner.send(:end_element, name)
+    @owner.end_element(name)
   end
 
-
   def cdata_block(t)
-    @owner.send(:characters, t)
+    @owner.characters(t)
   end
   
   def characters(t)
-    @owner.send(:characters, t)
+    @owner.characters(t)
   end
   
   def comment(t)
-    @owner.send(:characters,t)
+    @owner.characters(t)
   end
 end
 

data/lib/xsd/xmlparser/ogaparser.rb

@@ -6,7 +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.
 
-require 'pp'
 require 'oga'
 
 
@@ -16,7 +15,7 @@ module XMLParser
 class OgaParser < XSD::XMLParser::Parser
 
   def do_parse(string_or_readable)
-    # Oga::XML::SaxParser.new(self, string_or_readable)    
+    $stderr.puts "XSD::XMLParser::OgaParser.do_parse" if $DEBUG    
     Oga.sax_parse_xml(self, string_or_readable)
   end
 
@@ -29,26 +28,17 @@ class OgaParser < XSD::XMLParser::Parser
     end_element(node_name(namespace, name))
   end
 
-
-  def on_cdata(t)
-    characters(t)
-  end
-  
-  def on_comment(t)
-    characters(t)
-  end
-
   def on_text(t)
     characters(t)
   end
 
-  
+  alias_method :on_cdata,   :on_text
+  alias_method :on_comment, :on_text
+
   def on_xml_decl(attr_hash)
-    # attr_hash['version'] = '1.0'; attr_hash['encoding'] = 'utf-8' (usually)
-    # $stderr.puts "XML Document #{attr_hash['version']} in #{attr_hash['encoding']} encoding." 
+    send :xmldecl_encoding=,attr_hash['encoding'] 
   end
 
-
   private
 
   def node_name(namespace, name)

data/lib/xsd/xmlparser/oxparser.rb

@@ -8,93 +8,89 @@
 
 require 'ox'
 
-
 module XSD
 module XMLParser
 
 class OxParser < XSD::XMLParser::Parser
   def do_parse(string_or_readable)
-    @element_stack = []
+    $stderr.puts "XSD::XMLParser::OxParser.do_parse" if $DEBUG
     begin
       require 'htmlentities' # Used to unescape html-escaped chars, if available
       @decoder = ::HTMLEntities.new(:expanded)
     rescue LoadError
       @decoder = nil
     end
+    handler = OxDocHandler.new(self, @decoder)
 
     string = string_or_readable.respond_to?(:read) ? string_or_readable.read : StringIO.new(string_or_readable)
     if @decoder.nil?
       # Use the built-in conversion with Ox.
-      ::Ox.sax_parse(self, string, {:symbolize=> false, :convert_special=> true, :skip=> :skip_return} )
+      ::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(self, string, {})
+      ::Ox.sax_parse(handler, string, {})
     end
   end
+  
+  public :start_element
+  public :end_element
+  public :characters
+  public :xmldecl_encoding=
 
+  add_factory(self)
+end
 
-  alias_method :base_start_element, :start_element
-  def start_element(n)
-    # $stderr.puts "OxParser.start_element INVOKED [#{n}]"
-    @element_stack.push n.to_s # Push the Element Name
-    @element_stack.push Hash.new
+class OxDocHandler
+  
+  def initialize(owner, decoder)
+    @owner = owner
+    @decoder = decoder
+    reset_for_next_element
   end
-
-  alias_method :base_end_element, :end_element
-  def end_element(n)
-    # $stderr.puts "OxParser.end_element INVOKED [#{n}]"
-    if @element_stack[-2].to_s == n.to_s
-      attr_hash = @element_stack.pop
-      attr_key  = @element_stack.pop
-    else
-      $stderr.puts "!!!! OxParser.end_element FAILED TO FIND STACK PAIR [#{n}] IN STACK [#{PP.pp(@element_stack,'')}]"
+  
+  def attr(key, val)
+    @attr_hash[key.to_s]=val
+  end
+  
+  def attrs_done
+    unless @element_name.nil?
+      @owner.start_element(@element_name, @attr_hash) 
+      reset_for_next_element
     end
-    base_end_element(n.to_s)
   end
-
-
-  def text(t)
-    @decoder.nil? ? characters(t) : characters(@decoder.decode(t))
+  
+  def start_element(name)
+    @element_name = name.to_s
+  end
+  
+  def end_element(name)
+    name = name.to_s
+    @owner.end_element(name) unless @element_name.nil?
   end
 
-  def cdata(t)
-    ## CAUTION:  Ox Parser removes leading/trailing whitespace or blank lines. ##
-    ## This behavior is evident if you run the regression test:
-    ##
-    ##    SOAP4R_PARSERS=oxparser bundle exec rake test:single test/soap/test_response_as_xml.rb
-    ##
-    @decoder.nil? ? characters(t) : characters(@decoder.decode(t))
+  def text(t)
+    @decoder.nil? ? @owner.characters(t) : @owner.characters(@decoder.decode(t))
   end
   
-  def comment(t)
-    @decoder.nil? ? characters(t) : characters(@decoder.decode(t))
-  end
+  alias_method :cdata, :text
 
 
   def instruct(n)
-    # Do nothing. This is the outer "XML" tag.
+    # Set @element_name to nil so DocHandler does nothing with attrs or element name. This is the outer "XML" tag.
+    @element_name = nil
   end
 
   def end_instruct(n)
-    # Do nothing.
+    @owner.xmldecl_encoding= @attr_hash['encoding']
+    reset_for_next_element
   end
 
-
-  def attr(key,val)
-    return if @element_stack[-1].nil?
-
-    attr_hash = @element_stack[-1]
-    attr_hash[key.to_s] = val
-  end
+  private
   
-  def attrs_done
-    attr_hash = @element_stack[-1]
-    name = @element_stack[-2]
-
-    base_start_element(name, attr_hash) unless attr_hash.nil?
-  end
-
-  add_factory(self)
+  def reset_for_next_element
+    @attr_hash = {}
+    @element_name = ""
+  end  
 end
 
 end

data/lib/xsd/xmlparser/parser.rb

@@ -11,7 +11,6 @@ require 'xsd/qname'
 require 'xsd/ns'
 require 'xsd/charset'
 
-
 module XSD
 module XMLParser
 
@@ -89,6 +88,7 @@ private
   def xmldecl_encoding=(charset)
     if @charset.nil?
       @charset = charset
+      p "encoding definition: #{ charset } is configured." if $DEBUG
     else
       # Definition in a stream (like HTTP) has a priority.
       p "encoding definition: #{ charset } is ignored." if $DEBUG

data/lib/xsd/xmlparser/rexmlparser.rb

@@ -19,12 +19,8 @@ class REXMLParser < XSD::XMLParser::Parser
   include REXML::StreamListener
 
   def do_parse(string_or_readable)
-    source = nil
-    source = REXML::SourceFactory.create_from(string_or_readable)
-    source.encoding = charset if charset
-    # Listener passes a String in utf-8.
-    @charset = 'utf-8'
-    REXML::Document.parse_stream(source, self)
+    $stderr.puts "XSD::XMLParser::REXMLParser.do_parse" if $DEBUG    
+    REXML::Document.parse_stream(string_or_readable, self)
   end
 
   def epilogue
@@ -47,7 +43,7 @@ class REXMLParser < XSD::XMLParser::Parser
   end
 
   def xmldecl(version, encoding, standalone)
-    # Version should be checked.
+    send :xmldecl_encoding=, encoding
   end
 
   add_factory(self)

metadata

@@ -1,44 +1,45 @@
 --- !ruby/object:Gem::Specification
 name: soap4r-ng
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Laurence A. Lee, Hiroshi NAKAMURA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-19 00:00:00.000000000 Z
+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
-description: 
+description: Soap4R NextGen (as maintained by RubyJedi) for Ruby 1.8 thru 2.1 and
+  beyond
 email: rubyjedi@gmail.com, nahi@ruby-lang.org
 executables:
 - wsdl2ruby.rb
@@ -209,7 +210,8 @@ files:
 - lib/xsd/xmlparser/parser.rb
 - lib/xsd/xmlparser/rexmlparser.rb
 homepage: http://rubyjedi.github.io/soap4r/
-licenses: []
+licenses:
+- Ruby
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -217,12 +219,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: