rubyjedi-soap4r 1.5.8.20100619003610 → 2.0.2.1

data/lib/wsdl/xmlSchema/whitespace.rb

@@ -1,4 +1,4 @@
-# encoding: ASCII-8BIT
+# encoding: UTF-8
 # WSDL4R - XMLSchema whiteSpace definition for WSDL.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 

data/lib/wsdl/xmlSchema/xsd2ruby.rb

@@ -1,4 +1,4 @@
-# encoding: ASCII-8BIT
+# encoding: UTF-8
 # XSD4R - XSD to ruby mapping library.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 
@@ -14,6 +14,7 @@ require 'wsdl/soap/classDefCreatorSupport'
 require 'wsdl/soap/literalMappingRegistryCreator'
 require 'wsdl/soap/classNameCreator'
 require 'logger'
+require 'logger-application' unless defined?(Logger::Application)
 
 
 module WSDL
@@ -122,7 +123,7 @@ private
       filename = File.join(basedir, filename)
     end
     File.open(filename, "w") do |f|
-      f.puts "# encoding: ASCII-8BIT"
+      f.puts "# encoding: UTF-8"
       yield f
     end
   end

data/lib/xsd/charset.rb

@@ -1,4 +1,4 @@
-# encoding: ASCII-8BIT
+# encoding: UTF-8
 # XSD4R - Charset handling library.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 
@@ -11,7 +11,7 @@ module XSD
 
 
 module Charset
-  @internal_encoding = (RUBY_VERSION.to_f >= 1.9) ? 'UTF8' : $KCODE 
+  @internal_encoding = (RUBY_VERSION.to_f <= 1.8) ? $KCODE : 'UTF8' 
 
   class XSDError < StandardError; end
   class CharsetError < XSDError; end

data/lib/xsd/codegen.rb

@@ -1,4 +1,4 @@
-# encoding: ASCII-8BIT
+# encoding: UTF-8
 # XSD4R - Generating code library
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 

data/lib/xsd/codegen/classdef.rb

@@ -1,4 +1,4 @@
-# encoding: ASCII-8BIT
+# encoding: UTF-8
 # XSD4R - Generating class definition code
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 

data/lib/xsd/codegen/commentdef.rb

@@ -1,4 +1,4 @@
-# encoding: ASCII-8BIT
+# encoding: UTF-8
 # XSD4R - Generating comment definition code
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 

data/lib/xsd/codegen/gensupport.rb

@@ -1,4 +1,4 @@
-# encoding: ASCII-8BIT
+# encoding: UTF-8
 # XSD4R - Code generation support
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 

data/lib/xsd/codegen/methoddef.rb

@@ -1,4 +1,4 @@
-# encoding: ASCII-8BIT
+# encoding: UTF-8
 # XSD4R - Generating method definition code
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 

data/lib/xsd/codegen/moduledef.rb

@@ -1,4 +1,4 @@
-# encoding: ASCII-8BIT
+# encoding: UTF-8
 # XSD4R - Generating module definition code
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 

data/lib/xsd/datatypes.rb

@@ -1,4 +1,4 @@
-# encoding: ASCII-8BIT
+# encoding: UTF-8
 # XSD4R - XML Schema Datatype implementation.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 
@@ -503,7 +503,6 @@ private
 end
 
 
-require 'rational'
 require 'date'
 
 module XSDDateTimeImpl
@@ -540,7 +539,7 @@ module XSDDateTimeImpl
   end
 
   def to_date
-    Date.new!(@data.class.send(:jd_to_ajd, @data.jd, 0, 0), 0, @data.start)
+    @data.respond_to?(:to_date) ? @data.to_date : Date.new!(@data.class.send(:jd_to_ajd, @data.jd, 0, 0), 0, @data.start)
   end
 
   def to_datetime

data/lib/xsd/datatypes1999.rb

@@ -1,4 +1,4 @@
-# encoding: ASCII-8BIT
+# 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,4 @@
-# encoding: ASCII-8BIT
+# encoding: UTF-8
 # XSD4R - Charset handling with iconv.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 
@@ -6,15 +6,14 @@
 # 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'
-
+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

data/lib/xsd/mapping.rb

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

data/lib/xsd/qname.rb

@@ -1,4 +1,4 @@
-# encoding: ASCII-8BIT
+# encoding: UTF-8
 # XSD4R - XML QName definition.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 

data/lib/xsd/xmlparser.rb

@@ -1,4 +1,4 @@
-# encoding: ASCII-8BIT
+# encoding: UTF-8
 # XSD4R - XML Instance parser library.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 
@@ -6,60 +6,64 @@
 # 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
 
-module XSD
-
-
-module XMLParser
-  def create_parser(host, opt)
-    XSD::XMLParser::Parser.create_parser(host, opt)
-  end
-  module_function :create_parser
+    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, 'n')
+    # $1 is necessary.
+    NSParseRegexp = Regexp.new('^xmlns:?(.*)$', nil)
 
-  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
+    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
-	# tag == '' means 'default namespace'
-        # value == '' means 'no default namespace'
-	tag = $1 || ''
-	ns.assign(value, tag)
-      else
-	newattrs[key] = value
       end
+      return [ns, newattrs]
     end
-    return [ns, newattrs]
+    module_function :filter_ns
+
   end
-  module_function :filter_ns
 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
 
-
 # Try to load XML processor.
 loaded = false
-[
-  'nokogiri',
-#  'libxmlparser',
-#  'xmlparser',
-#  'xmlscanner',
-  'rexmlparser',
-].each do |name|
+parser_list.each do |name|
   begin
     require "xsd/xmlparser/#{name}"
     # XXX: for a workaround of rubygems' require inconsistency

data/lib/xsd/xmlparser/libxmlparser.rb

@@ -1,4 +1,4 @@
-# encoding: ASCII-8BIT
+# encoding: UTF-8
 # XSD4R - XMLParser XML parser library.
 # Copyright (C) 2000-2007  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 
@@ -6,30 +6,33 @@
 # 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 'xsd/xmlparser'
-require 'xml/libxml'
-
+require 'libxml'
 
 module XSD
 module XMLParser
 
 
 class LibXMLParser < XSD::XMLParser::Parser
-  include XML::SaxParser::Callbacks
+  include ::LibXML::XML::SaxParser::Callbacks
 
   def do_parse(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.
+    $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'
-    @parser = XML::SaxParser.new
-    @parser.callbacks = self
-    @parser.string = string
-    @parser.parse
+    string = StringIO.new(string_or_readable)
+    parser = LibXML::XML::SaxParser.io(string)
+    parser.callbacks = self
+    parser.parse
   end
 
   ENTITY_REF_MAP = {
@@ -64,12 +67,29 @@ class LibXMLParser < XSD::XMLParser::Parser
   #  nil
   #end
 
-  def on_start_element(name, attr_hash)
-    start_element(name, attr_hash)
+  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)
+    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)
   end
 
   def on_end_element(name)
-    end_element(name)
+    # end_element(name)
   end
 
   def on_reference(name)

data/lib/xsd/xmlparser/nokogiriparser.rb

@@ -0,0 +1,63 @@
+# encoding: UTF-8
+# XSD4R - Nokogiri XML parser library.
+# Copyright (C) 2015 Laurence A. Lee <rubyjedi@gmail.com>
+
+# This program is copyrighted free software by Laurence A. Lee.  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 'nokogiri'
+
+module XSD
+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
+
+
+class NokoDocHandler < Nokogiri::XML::SAX::Document
+  def initialize(owner)
+    @owner = (owner)
+  end
+
+  def xmldecl(version, encoding, standalone)
+    @owner.xmldecl_encoding= encoding
+  end
+
+  def start_element(name,attrs)
+    @owner.start_element(name,Hash[*attrs.flatten])
+  end
+  
+  def end_element(name)
+    @owner.end_element(name)
+  end
+
+  def cdata_block(t)
+    @owner.characters(t)
+  end
+  
+  def characters(t)
+    @owner.characters(t)
+  end
+  
+  def comment(t)
+    @owner.characters(t)
+  end
+end
+
+
+end
+end

data/lib/xsd/xmlparser/ogaparser.rb

@@ -0,0 +1,53 @@
+# encoding: UTF-8
+# OgaParser XML parser library.
+# Copyright (C) 2015 Laurence A. Lee <rubyjedi@gmail.com>.
+
+# This program is copyrighted free software by Laurence A. Lee.  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 'oga'
+
+
+module XSD
+module XMLParser
+
+class OgaParser < XSD::XMLParser::Parser
+
+  def do_parse(string_or_readable)
+    $stderr.puts "XSD::XMLParser::OgaParser.do_parse" if $DEBUG    
+    Oga.sax_parse_xml(self, string_or_readable)
+  end
+
+
+  def on_element(namespace, name, attrs)
+    start_element(node_name(namespace, name), attrs)
+  end
+
+  def after_element(namespace, name)
+    end_element(node_name(namespace, name))
+  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)
+    send :xmldecl_encoding=,attr_hash['encoding'] 
+  end
+
+  private
+
+  def node_name(namespace, name)
+    namespace ? "#{namespace}:#{name}" : name.to_s
+  end
+
+  add_factory(self)
+
+end
+
+end
+end