rubyjedi-soap4r 1.5.8.01 → 1.5.8.20100616125722

data/lib/wsdl/xmlSchema/xsd2ruby.rb

@@ -49,7 +49,7 @@ private
   end
 
   def create_file
-    @modulepath = Array(@opt['module_path'])
+    @modulepath = @opt['module_path']
     create_classdef if @opt.key?('classdef')
     create_mapping_registry if @opt.key?('mapping_registry')
     create_mapper if @opt.key?('mapper')

data/lib/xsd/charset.rb

@@ -10,7 +10,7 @@ module XSD
 
 
 module Charset
-  @internal_encoding = "UTF8" #$KCODE
+  @internal_encoding = (RUBY_VERSION.to_f >= 1.9) ? 'UTF8' : $KCODE 
 
   class XSDError < StandardError; end
   class CharsetError < XSDError; end
@@ -129,7 +129,7 @@ public
 
   # us_ascii = '[\x00-\x7F]'
   us_ascii = '[\x9\xa\xd\x20-\x7F]'	# XML 1.0 restricted.
-  USASCIIRegexp = Regexp.new("\\A#{us_ascii}*\\z")
+  USASCIIRegexp = Regexp.new("\\A#{us_ascii}*\\z", nil, 'n')
 
   twobytes_euc = '(?:[\x8E\xA1-\xFE][\xA1-\xFE])'
   threebytes_euc = '(?:\x8F[\xA1-\xFE][\xA1-\xFE])'
@@ -149,7 +149,8 @@ public
   threebytes_utf8 = '(?:[\xE0-\xEF][\x80-\xBF][\x80-\xBF])'
   # 11110uuu 10uuuzzz 10yyyyyy 10xxxxxx
   fourbytes_utf8 = '(?:[\xF0-\xF7][\x80-\xBF][\x80-\xBF][\x80-\xBF])'
-  character_utf8 = "(?:#{us_ascii}|#{twobytes_utf8}|#{threebytes_utf8}|#{fourbytes_utf8})"
+  character_utf8 =
+    "(?:#{us_ascii}|#{twobytes_utf8}|#{threebytes_utf8}|#{fourbytes_utf8})"
   UTF8Regexp = Regexp.new("\\A#{character_utf8}*\\z", nil, 'n')
 
   def Charset.is_us_ascii(str)

data/lib/xsd/codegen/gensupport.rb

@@ -227,7 +227,7 @@ module GenSupport
     str = trim_eol(str)
     str = trim_indent(str)
     if indent
-      str.gsub(/^/, " " * indent)
+      str.to_s.gsub(/^/, " " * indent)
     else
       str
     end
@@ -236,22 +236,25 @@ module GenSupport
 private
 
   def trim_eol(str)
-    str.lines.collect { |line|
+    str = str.lines if str.respond_to?(:lines) # RubyJedi: compatible with Ruby 1.8.6 and above
+    str.collect { |line|
       line.sub(/\r?\n\z/, "") + "\n"
     }.join
   end
 
   def trim_indent(str)
     indent = nil
-    str = str.lines.collect { |line| untab(line) }.join
-    str.each_line do |line|
+    str = str.lines if str.respond_to?(:lines) # RubyJedi: compatible with Ruby 1.8.6 and above
+    str = str.collect { |line| untab(line) }.join
+    str = str.lines if str.respond_to?(:lines) # RubyJedi: compatible with Ruby 1.8.6 and above
+    str.each do |line|
       head = line.index(/\S/)
       if !head.nil? and (indent.nil? or head < indent)
         indent = head
       end
     end
     return str unless indent
-    str.lines.collect { |line|
+    str.collect { |line|
       line.sub(/^ {0,#{indent}}/, "")
     }.join
   end

data/lib/xsd/datatypes.rb

@@ -631,7 +631,7 @@ private
     if secfrac
       diffday = secfrac.to_i.to_r / (10 ** secfrac.size) / DayInSec
       data += diffday
-      # FYI: new0 and jd_to_rjd are not necessary to use if you don't have
+      # FYI: new! and jd_to_rjd are not necessary to use if you don't have
       # exceptional reason.
     end
     [data, secfrac]
@@ -647,14 +647,14 @@ private
 
   def _to_s
     year = (@data.year > 0) ? @data.year : @data.year - 1
-    s = format('%.4d-%02d-%02dT%02d:%02d:%02d',
-      year, @data.mon, @data.mday, @data.hour, @data.min, @data.sec)
+    s = format('%.4d-%02d-%02dT%02d:%02d:%02d', year, @data.mon, @data.mday, @data.hour, @data.min, @data.sec)
     if @data.sec_fraction.nonzero?
       if @secfrac
-  	s << ".#{ @secfrac }"
+        s << ".#{ @secfrac }"
+      elsif (RUBY_VERSION.to_f >= 1.9) # RubyJedi: Ruby 1.9's DateTime.sec_fraction() appears to be more 'sane' and doesn't need to be multiplied.
+        s << sprintf("%.16f", @data.sec_fraction.to_f).sub(/^0/, '').sub(/0*$/, '')
       else
-	s << sprintf("%.16f",
-          (@data.sec_fraction * DayInSec).to_f).sub(/^0/, '').sub(/0*$/, '')
+        s << sprintf("%.16f",(@data.sec_fraction * DayInSec).to_f).sub(/^0/, '').sub(/0*$/, '')
       end
     end
     add_tz(s)

data/lib/xsd/ns.rb

@@ -123,7 +123,7 @@ public
   end
 
   # $1 and $2 are necessary.
-  ParseRegexp = Regexp.new('\A([^:]+)(?::(.+))?\z')
+  ParseRegexp = Regexp.new('\A([^:]+)(?::(.+))?\z', nil, 'n')
 
   def parse(str, local = false)
     if ParseRegexp =~ str

data/lib/xsd/qname.rb

@@ -15,8 +15,8 @@ class QName
   attr_accessor :source
 
   def initialize(namespace = nil, name = nil)
-    @namespace = namespace
-    @name = name
+    @namespace = namespace ? namespace.to_s : nil
+    @name = name ? name.to_s : nil
     @source = nil
   end
 

data/lib/xsd/xmlparser.rb

@@ -7,7 +7,6 @@
 
 
 require 'xsd/xmlparser/parser'
-require 'soap/property'
 
 
 module XSD
@@ -20,7 +19,7 @@ module XMLParser
   module_function :create_parser
 
   # $1 is necessary.
-  NSParseRegexp = Regexp.new("^xmlns:?(.*)$")
+  NSParseRegexp = Regexp.new('^xmlns:?(.*)$', nil, 'n')
 
   def filter_ns(ns, attrs)
     ns_updated = false
@@ -51,26 +50,21 @@ end
 end
 
 
-PARSER_LIBS = [
-  'nokogiri',
-  'libxmlparser',
-  '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_LIBS.each do |name|
+[
+  'nokogiri',
+#  'libxmlparser',
+#  'xmlparser',
+#  'xmlscanner',
+  'rexmlparser',
+].each do |name|
   begin
-    lib = "xsd/xmlparser/#{name}"
-    require lib unless !use_libxml && name == 'libxmlparser'
+    require "xsd/xmlparser/#{name}"
     # 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.downcase
+      c.to_s.downcase == name
     }
     loaded = true
     break
@@ -79,4 +73,4 @@ PARSER_LIBS.each do |name|
 end
 unless loaded
   raise RuntimeError.new("XML processor module not found.")
-end
+end

data/lib/xsd/xmlparser/libxmlparser.rb

@@ -25,11 +25,12 @@ class LibXMLParser < XSD::XMLParser::Parser
     end
     # XMLParser passes a String in utf-8.
     @charset = 'utf-8'
-    @parser = XML::SaxParser.string(string)
+    @parser = XML::SaxParser.new
     @parser.callbacks = self
+    @parser.string = string
     @parser.parse
   end
-  
+
   ENTITY_REF_MAP = {
     'lt' => '<',
     'gt' => '>',
@@ -61,14 +62,9 @@ class LibXMLParser < XSD::XMLParser::Parser
   #def on_end_document()
   #  nil
   #end
-  
-  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
-    start_element(name, attributes)
+
+  def on_start_element(name, attr_hash)
+    start_element(name, attr_hash)
   end
 
   def on_end_element(name)

data/test/helper.rb

@@ -0,0 +1,6 @@
+require 'test/unit'
+require 'rubygems'
+require 'test/unit/xml' ## RubyJedi
+
+ENV['DEBUG_SOAP4R'] = 'true' ## Needed to force wsdl2ruby.rb and xsd2ruby.rb to use DEVELOPMENT soap4r libs instead of installed soap4r libs
+$DEBUG = !!ENV['WIREDUMPS']

data/test/soap/asp.net/test_aspdotnet.rb

@@ -1,7 +1,7 @@
-require 'test/unit'
+require 'helper'
+require 'testutil'
 require 'soap/rpc/standaloneServer'
 require 'soap/rpc/driver'
-require File.join(File.dirname(File.expand_path(__FILE__)), '..', '..', 'testutil.rb')
 
 
 module SOAP; module ASPDotNet
@@ -108,7 +108,7 @@ __XML__
       @client.add_method_with_soapaction('sayHello', Server::Namespace + 'SayHello', 'name')
       @client.default_encodingstyle = SOAP::EncodingStyle::ASPDotNetHandler::Namespace
       assert_equal("Hello Mike", @client.sayHello("Mike"))
-      assert_equal(REQUEST_ASPDOTNETHANDLER, parse_requestxml(str),
+      assert_xml_equal(REQUEST_ASPDOTNETHANDLER, parse_requestxml(str),
         [REQUEST_ASPDOTNETHANDLER, parse_requestxml(str)].join("\n\n"))
     end
 

data/test/soap/auth/test_basic.rb

@@ -1,9 +1,9 @@
-require 'test/unit'
+require 'helper'
+require 'testutil'
 require 'soap/rpc/driver'
 require 'webrick'
 require 'webrick/httpproxy'
 require 'logger'
-require File.join(File.dirname(File.expand_path(__FILE__)), '..', '..', 'testutil.rb')
 
 
 module SOAP; module Auth

data/test/soap/auth/test_digest.rb

@@ -1,9 +1,9 @@
-require 'test/unit'
+require 'helper'
+require 'testutil'
 require 'soap/rpc/driver'
 require 'webrick'
 require 'webrick/httpproxy'
 require 'logger'
-require File.join(File.dirname(File.expand_path(__FILE__)), '..', '..', 'testutil.rb')
 
 
 module SOAP; module Auth

data/test/soap/calc/server.cgi

@@ -1,3 +1,5 @@
+$:.unshift File.expand_path(File.dirname(__FILE__)+'/../../../lib')
+$:.unshift '.' if RUBY_VERSION.to_f >= 1.9
 require 'soap/rpc/cgistub'
 
 class CalcServer < SOAP::RPC::CGIStub

data/test/soap/calc/test_calc.rb

@@ -1,6 +1,7 @@
-require 'test/unit'
+require 'helper'
+require 'testutil'
 require 'soap/rpc/driver'
-require 'server.rb'
+TestUtil.require(File.dirname(__FILE__), 'server.rb')
 
 
 module SOAP

data/test/soap/calc/test_calc2.rb

@@ -1,6 +1,7 @@
-require 'test/unit'
+require 'helper'
+require 'testutil'
 require 'soap/rpc/driver'
-require 'server2.rb'
+TestUtil.require(File.dirname(__FILE__), 'server2.rb')
 
 
 module SOAP

data/test/soap/calc/test_calc_cgi.rb

@@ -1,4 +1,4 @@
-require 'test/unit'
+require 'helper'
 require 'soap/rpc/driver'
 require 'logger'
 require 'webrick'

data/test/soap/case/test_mapping.rb

@@ -1,4 +1,4 @@
-require 'test/unit'
+require 'helper'
 require 'soap/marshal'
 
 
@@ -49,7 +49,7 @@ class TestMapping < Test::Unit::TestCase
 </env:Envelope>
 __XML__
     o = TTMHeader.new("dsn", "password", "schema", "username")
-    assert_equal(dump, SOAP::Marshal.dump(o))
+    assert_xml_equal(dump, SOAP::Marshal.dump(o))
   end
 end
 

data/test/soap/fault/test_customfault.rb

@@ -1,4 +1,4 @@
-require 'test/unit'
+require 'helper'
 require 'soap/rpc/driver'
 require 'soap/rpc/standaloneServer'
 

data/test/soap/fault/test_fault.rb

@@ -1,4 +1,4 @@
-require 'test/unit'
+require 'helper'
 require 'soap/rpc/driver'
 require 'soap/rpc/standaloneServer'
 

data/test/soap/fault/test_soaparray.rb

@@ -1,7 +1,7 @@
+require 'helper'
 require 'soap/rpc/router'
 require 'soap/mapping/mapping'
 require 'soap/processor'
-require 'test/unit'
 
 
 module SOAP

data/test/soap/filter/test_filter.rb

@@ -1,4 +1,4 @@
-require 'test/unit'
+require 'helper'
 require 'soap/rpc/driver'
 require 'soap/rpc/standaloneServer'
 require 'soap/filter'

data/test/soap/header/server.cgi

@@ -1,3 +1,4 @@
+$:.unshift File.expand_path(File.dirname(__FILE__)+'/../../../lib')
 require 'pstore'
 require 'soap/rpc/cgistub'
 require 'soap/header/simplehandler'

data/test/soap/header/test_authheader.rb

@@ -1,4 +1,4 @@
-require 'test/unit'
+require 'helper'
 require 'soap/rpc/driver'
 require 'soap/rpc/standaloneServer'
 require 'soap/header/simplehandler'

data/test/soap/header/test_authheader_cgi.rb

@@ -1,4 +1,4 @@
-require 'test/unit'
+require 'helper'
 require 'soap/rpc/driver'
 require 'soap/rpc/standaloneServer'
 require 'soap/header/simplehandler'

data/test/soap/header/test_simplehandler.rb

@@ -1,4 +1,4 @@
-require 'test/unit'
+require 'helper'
 require 'soap/rpc/driver'
 require 'soap/rpc/standaloneServer'
 require 'soap/header/simplehandler'

data/test/soap/helloworld/test_helloworld.rb

@@ -1,6 +1,7 @@
-require 'test/unit'
+require 'helper'
+require 'testutil'
 require 'soap/rpc/driver'
-require 'hw_s.rb'
+TestUtil.require(File.dirname(__FILE__), 'hw_s.rb')
 
 
 module SOAP

data/test/soap/literalArrayMapping/test_definedarray.rb

@@ -1,8 +1,8 @@
-require 'test/unit'
+require 'helper'
+require 'testutil'
 require 'soap/mapping'
 require 'soap/processor'
 require 'soap/rpc/element'
-require File.join(File.dirname(File.expand_path(__FILE__)), '..', '..', 'testutil.rb')
 
 
 module SOAP

data/test/soap/marshal/marshaltestlib.rb

@@ -26,12 +26,15 @@ module MarshalTestLib
     msg = msg ? msg + "(#{ caller[0] })" : caller[0]
     o2 = marshaltest(o1)
     assert_equal(o1.class, o2.class, msg)
+    
     iv1 = o1.instance_variables.sort
     iv2 = o2.instance_variables.sort
     assert_equal(iv1, iv2)
-    val1 = iv1.map {|var| o1.instance_eval {eval var}}
-    val2 = iv1.map {|var| o2.instance_eval {eval var}}
+    
+    val1 = iv1.map {|var| o1.instance_eval( "#{var}" )}
+    val2 = iv1.map {|var| o2.instance_eval( "#{var}" )}
     assert_equal(val1, val2, msg)
+    
     if block_given?
       assert_equal(yield(o1), yield(o2), msg)
     else

data/test/soap/marshal/test_digraph.rb

@@ -1,4 +1,4 @@
-require 'test/unit'
+require 'helper'
 require 'soap/marshal'
 
 

data/test/soap/marshal/test_marshal.rb

@@ -1,6 +1,7 @@
-require 'test/unit'
+require 'helper'
+require 'testutil'
 require 'soap/marshal'
-require File.join(File.dirname(File.expand_path(__FILE__)), 'marshaltestlib')
+TestUtil.require(File.dirname(__FILE__), 'marshaltestlib')
 
 
 if RUBY_VERSION > "1.7.0"