rtiss_soap4r 2.1.1 → 3.0.0.beta

data/lib/xsd/datatypes1999.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # XSD4R - XML Schema Datatype 1999 support
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 

data/lib/xsd/iconvcharset.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # XSD4R - Charset handling with iconv.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 
@@ -6,28 +5,12 @@
 # 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 'iconv' unless ''.respond_to? :encode
-
 module XSD
 
-
 class IconvCharset
   def self.safe_iconv(to, from, str)
-    return str.encode(to, from, :invalid => :replace, :undef => :replace, :replace => '?') if ''.respond_to? :encode
-    iconv = Iconv.new(to, from)
-    out = ""
-    begin
-      out << iconv.iconv(str)
-    rescue Iconv::IllegalSequence => e
-      out << e.success
-      ch, str = e.failed.split(//, 2)
-      out << '?'
-      warn("Failed to convert #{ch}")
-      retry
-    end
-    return out
+    str.force_encoding(from).chars.map { |c| c.valid_encoding? && c || '?' }.join.encode(to)
   end
-end
-
+end if RUBY_VERSION > '1.9'
 
 end

data/lib/xsd/mapping.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # XSD4R - XML Mapping for Ruby
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 

data/lib/xsd/namedelements.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # XSD4R - WSDL named element collection.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 

data/lib/xsd/ns.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # XSD4R - XML Schema Namespace library
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 
@@ -124,7 +123,7 @@ public
   end
 
   # $1 and $2 are necessary.
-  ParseRegexp = Regexp.new('\A([^:]+)(?::(.+))?\z', nil)
+  ParseRegexp = Regexp.new('\A([^:]+)(?::(.+))?\z')
 
   def parse(str, local = false)
     if ParseRegexp =~ str

data/lib/xsd/qname.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # XSD4R - XML QName definition.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 
@@ -16,8 +15,8 @@ class QName
   attr_accessor :source
 
   def initialize(namespace = nil, name = nil)
-    @namespace = namespace ? namespace.to_s : nil
-    @name = name ? name.to_s : nil
+    @namespace = namespace
+    @name = name
     @source = nil
   end
 

data/lib/xsd/xmlparser/libxmlparser.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # XSD4R - XMLParser XML parser library.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 
@@ -6,35 +5,31 @@
 # 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'
+require 'xsd/xmlparser'
+require 'xml/libxml'
+
 
 module XSD
 module XMLParser
 
 
 class LibXMLParser < XSD::XMLParser::Parser
-  include ::LibXML::XML::SaxParser::Callbacks
+  include 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
-
+    if string_or_readable.respond_to?(:read)
+      string = string_or_readable.read
+    else
+      string = string_or_readable
+    end
+    # XMLParser passes a String in utf-8.
     @charset = 'utf-8'
-    string = StringIO.new(string_or_readable)
-    parser = LibXML::XML::SaxParser.io(string)
-    parser.callbacks = self
-    parser.parse
+    @parser = XML::SaxParser.string(string)
+    @parser.callbacks = self
+    @parser.parse
   end
-
+  
   ENTITY_REF_MAP = {
     'lt' => '<',
     'gt' => '>',
@@ -66,30 +61,18 @@ class LibXMLParser < XSD::XMLParser::Parser
   #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)
+  
+  def on_start_element_ns(name, attributes, prefix, uri, namespaces)
+    name = "#{prefix}:#{name}" unless prefix.nil?
+    namespaces.each do |key,value|
+      nsprefix = key.nil? ? "xmlns" : "xmlns:#{key}"
+      attributes[nsprefix] = value
     end
-  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)
+    start_element(name, attributes)
   end
 
   def on_end_element(name)
-    # end_element(name)
+    end_element(name)
   end
 
   def on_reference(name)

data/lib/xsd/xmlparser/parser.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # XSD4R - XML Instance parser library.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 
@@ -11,6 +10,7 @@ require 'xsd/qname'
 require 'xsd/ns'
 require 'xsd/charset'
 
+
 module XSD
 module XMLParser
 
@@ -88,7 +88,6 @@ 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

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # XSD4R - REXMLParser XML parser library.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 
@@ -7,6 +6,7 @@
 # either the dual license version in 2003, or any later version.
 
 
+require 'xsd/xmlparser'
 require 'rexml/streamlistener'
 require 'rexml/document'
 
@@ -19,8 +19,12 @@ class REXMLParser < XSD::XMLParser::Parser
   include REXML::StreamListener
 
   def do_parse(string_or_readable)
-    $stderr.puts "XSD::XMLParser::REXMLParser.do_parse" if $DEBUG    
-    REXML::Document.parse_stream(string_or_readable, self)
+    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)
   end
 
   def epilogue
@@ -43,7 +47,7 @@ class REXMLParser < XSD::XMLParser::Parser
   end
 
   def xmldecl(version, encoding, standalone)
-    send :xmldecl_encoding=, encoding
+    # Version should be checked.
   end
 
   add_factory(self)

data/lib/xsd/xmlparser/xmlparser.rb

@@ -0,0 +1,50 @@
+# XSD4R - XMLParser XML parser library.
+# Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# 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 'xsd/xmlparser'
+require 'xml/parser'
+
+
+module XSD
+  module XMLParser
+
+
+    class XMLParser < XSD::XMLParser::Parser
+      class Listener < XML::Parser
+        begin
+          require 'xml/encoding-ja'
+          include XML::Encoding_ja
+        rescue LoadError
+          # uconv may not be installed.
+        end
+      end
+
+      def do_parse(string_or_readable)
+        # XMLParser passes a String in utf-8.
+        @charset = 'utf-8'
+        @parser = Listener.new
+        @parser.parse(string_or_readable) do |type, name, data|
+          case type
+          when XML::Parser::START_ELEM
+            start_element(name, data)
+          when XML::Parser::END_ELEM
+            end_element(name)
+          when XML::Parser::CDATA
+            characters(data)
+          else
+            raise FormatDecodeError.new("Unexpected XML: #{ type }/#{ name }/#{ data }.")
+          end
+        end
+      end
+
+      add_factory(self)
+    end
+
+
+  end
+end

data/lib/xsd/xmlparser/xmlscanner.rb

@@ -0,0 +1,149 @@
+# XSD4R - XMLScan XML parser library.
+# Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# 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 'xsd/xmlparser'
+require 'xmlscan/scanner'
+
+
+module XSD
+module XMLParser
+
+
+class XMLScanner < XSD::XMLParser::Parser
+  include XMLScan::Visitor
+
+  def do_parse(string_or_readable)
+    @attrs = {}
+    @curattr = nil
+    @scanner = XMLScan::XMLScanner.new(self)
+    @scanner.kcode = XSD::Charset.charset_str(charset) if charset
+    @scanner.parse(string_or_readable)
+  end
+
+  def scanner_kcode=(charset)
+    @scanner.kcode = XSD::Charset.charset_str(charset) if charset
+    self.xmldecl_encoding = charset
+  end
+
+  ENTITY_REF_MAP = {
+    'lt' => '<',
+    'gt' => '>',
+    'amp' => '&',
+    'quot' => '"',
+    'apos' => '\''
+  }
+
+  def parse_error(msg)
+    raise ParseError.new(msg)
+  end
+
+  def wellformed_error(msg)
+    raise NotWellFormedError.new(msg)
+  end
+
+  def valid_error(msg)
+    raise NotValidError.new(msg)
+  end
+
+  def warning(msg)
+    warn(msg)
+  end
+
+  # def on_xmldecl; end
+
+  def on_xmldecl_version(str)
+    # 1.0 expected.
+  end
+
+  def on_xmldecl_encoding(str)
+    self.scanner_kcode = str
+  end
+
+  # def on_xmldecl_standalone(str); end
+
+  # def on_xmldecl_other(name, value); end
+
+  # def on_xmldecl_end; end
+
+  # def on_doctype(root, pubid, sysid); end
+
+  # def on_prolog_space(str); end
+
+  # def on_comment(str); end
+
+  # def on_pi(target, pi); end
+
+  def on_chardata(str)
+    characters(str)
+  end
+
+  def on_cdata(str)
+    characters(str)
+  end
+
+  def on_etag(name)
+    end_element(name)
+  end
+
+  def on_entityref(ref)
+    characters(ENTITY_REF_MAP[ref])
+  end
+
+  def on_charref(code)
+    characters([code].pack('U'))
+  end
+
+  def on_charref_hex(code)
+    on_charref(code)
+  end
+
+  # def on_start_document; end
+
+  # def on_end_document; end
+
+  def on_stag(name)
+    @attrs = {}
+  end
+
+  def on_attribute(name)
+    @attrs[name] = @curattr = ''
+  end
+
+  def on_attr_value(str)
+    @curattr << str
+  end
+
+  def on_attr_entityref(ref)
+    @curattr << ENTITY_REF_MAP[ref]
+  end
+
+  def on_attr_charref(code)
+    @curattr << [code].pack('U')
+  end
+
+  def on_attr_charref_hex(code)
+    on_attr_charref(code)
+  end
+
+  # def on_attribute_end(name); end
+
+  def on_stag_end_empty(name)
+    on_stag_end(name)
+    on_etag(name)
+  end
+
+  def on_stag_end(name)
+    start_element(name, @attrs)
+  end
+
+  add_factory(self)
+end
+
+
+end
+end

data/lib/xsd/xmlparser.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # XSD4R - XML Instance parser library.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 
@@ -6,18 +5,21 @@
 # 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 'xsd/xmlparser/parser'
+require 'soap/property'
 
- module XSD
-  module XMLParser
 
-    def create_parser(host, opt)
+module XSD
+
+  module XMLParser
+    def create_parser(host, opt = {})
       XSD::XMLParser::Parser.create_parser(host, opt)
     end
     module_function :create_parser
 
     # $1 is necessary.
-    NSParseRegexp = Regexp.new('^xmlns:?(.*)$', nil)
+    NSParseRegexp = Regexp.new("^xmlns:?(.*)$")
 
     def filter_ns(ns, attrs)
       ns_updated = false
@@ -39,37 +41,29 @@ require 'xsd/xmlparser/parser'
           newattrs[key] = value
         end
       end
-      return [ns, newattrs]
+      [ns, newattrs]
     end
     module_function :filter_ns
-
   end
-end
 
 
-# Provide a means to CHOOSE a preferred XML Parser and loading-order, if multiple parser gems are available.
-if ENV.has_key?('SOAP4R_PARSERS')
-  parser_list = ENV['SOAP4R_PARSERS'].to_s.split(',')
-else
-  parser_list = [
-    'oxparser',     ## Uses its own C-Ruby Extension
-    'nokogiriparser',     ## Depends on LibXML2, LibXSLT, and ZLib
-    'libxmlparser', ## Depends on LibXML2 ; Thread-Safe ; Somewhat Broken re: Namespaces
-    # ----- Pure-Ruby Parsers Below ---- #
-    'ogaparser',    ## Pure-Ruby
-    'rexmlparser',  ## Pure-Ruby, this is the reference implementation.
-  ]
 end
 
+
+PARSER_LIBS = %w[xmlparser xmlscanner rexmlparser]
+# Get library prefs
+opt = ::SOAP::Property.loadproperty('soap/property')
+use_libxml = (opt and opt['parser'] and opt['parser']['use_libxml'] and opt['parser']['use_libxml'] == 'false') ? false : true
 # Try to load XML processor.
 loaded = false
-parser_list.each do |name|
+PARSER_LIBS.each do |name|
   begin
-    require "xsd/xmlparser/#{name}"
+    lib = "xsd/xmlparser/#{name}"
+    require lib unless !use_libxml && name == 'libxmlparser'
     # XXX: for a workaround of rubygems' require inconsistency
     # XXX: MUST BE REMOVED IN THE FUTURE
     raise LoadError unless XSD::XMLParser.constants.find { |c|
-      c.to_s.downcase == name
+      c.to_s.downcase == name.downcase
     }
     loaded = true
     break
@@ -79,3 +73,4 @@ end
 unless loaded
   raise RuntimeError.new("XML processor module not found.")
 end
+

data/lib/xsd/xmlparser.rb.orig

@@ -0,0 +1,76 @@
+# XSD4R - XML Instance parser library.
+# Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# 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 'xsd/xmlparser/parser'
+
+
+module XSD
+
+
+module XMLParser
+  def create_parser(host, opt)
+    XSD::XMLParser::Parser.create_parser(host, opt)
+  end
+  module_function :create_parser
+
+  # $1 is necessary.
+  NSParseRegexp = Regexp.new('^xmlns:?(.*)$', nil, 'NONE')
+
+  def filter_ns(ns, attrs)
+    ns_updated = false
+    if attrs.nil? or attrs.empty?
+      return [ns, attrs]
+    end
+    newattrs = {}
+    attrs.each do |key, value|
+      if NSParseRegexp =~ key
+        unless ns_updated
+          ns = ns.clone_ns
+          ns_updated = true
+        end
+	# tag == '' means 'default namespace'
+        # value == '' means 'no default namespace'
+	tag = $1 || ''
+	ns.assign(value, tag)
+      else
+	newattrs[key] = value
+      end
+    end
+    return [ns, newattrs]
+  end
+  module_function :filter_ns
+end
+
+
+end
+
+
+# Try to load XML processor.
+loaded = false
+[
+  'xsd/xmlparser/libxmlparser',
+  'xsd/xmlparser/xmlparser',
+  'xsd/xmlparser/xmlscanner',
+  'xsd/xmlparser/rexmlparser',
+].each do |lib|
+  begin
+    require lib
+    # XXX: for a workaround of rubygems' require inconsistency
+    # XXX: MUST BE REMOVED IN THE FUTURE
+    name = lib.sub(/^.*\//, '')
+    raise LoadError unless XSD::XMLParser.constants.find { |c|
+      c.downcase == name
+    }
+    loaded = true
+    break
+  rescue LoadError
+  end
+end
+unless loaded
+  raise RuntimeError.new("XML processor module not found.")
+end